Merge master into staging
This commit is contained in:
Frederik Rietdijk
commit
8fbe3a484a
2
.github/CONTRIBUTING.md
vendored
2
.github/CONTRIBUTING.md
vendored
@ -43,7 +43,7 @@ See the nixpkgs manual for more details on [standard meta-attributes](https://ni
|
||||
|
||||
## Writing good commit messages
|
||||
|
||||
In addition to writing properly formatted commit messages, it's important to include relevant information so other developers can later understand *why* a change was made. While this information usually can be found by digging code, mailing list archives, pull request discussions or upstream changes, it may require a lot of work.
|
||||
In addition to writing properly formatted commit messages, it's important to include relevant information so other developers can later understand *why* a change was made. While this information usually can be found by digging code, mailing list/Discourse archives, pull request discussions or upstream changes, it may require a lot of work.
|
||||
|
||||
For package version upgrades and such a one-line commit message is usually sufficient.
|
||||
|
||||
|
||||
@ -38,5 +38,4 @@ For pull-requests, please rebase onto nixpkgs `master`.
|
||||
Communication:
|
||||
|
||||
* [Discourse Forum](https://discourse.nixos.org/)
|
||||
* [Mailing list](https://groups.google.com/forum/#!forum/nix-devel)
|
||||
* [IRC - #nixos on freenode.net](irc://irc.freenode.net/#nixos)
|
||||
|
||||
@ -605,10 +605,11 @@ policy.
|
||||
-->
|
||||
|
||||
<para>
|
||||
In a case a contributor leaves definitively the Nix community, he should
|
||||
create an issue or notify the mailing list with references of packages and
|
||||
modules he maintains so the maintainership can be taken over by other
|
||||
contributors.
|
||||
In a case a contributor leaves definitively the Nix community, he
|
||||
should create an issue or post on <link
|
||||
xlink:href="https://discourse.nixos.org">Discourse</link> with
|
||||
references of packages and modules he maintains so the
|
||||
maintainership can be taken over by other contributors.
|
||||
</para>
|
||||
</section>
|
||||
</chapter>
|
||||
|
||||
@ -1970,6 +1970,11 @@
|
||||
github = "jpotier";
|
||||
name = "Martin Potier";
|
||||
};
|
||||
jqueiroz = {
|
||||
email = "nixos@johnjq.com";
|
||||
github = "jqueiroz";
|
||||
name = "Jonathan Queiroz";
|
||||
};
|
||||
jraygauthier = {
|
||||
email = "jraygauthier@gmail.com";
|
||||
github = "jraygauthier";
|
||||
@ -3878,6 +3883,11 @@
|
||||
github = "swarren83";
|
||||
name = "Shawn Warren";
|
||||
};
|
||||
swdunlop = {
|
||||
email = "swdunlop@gmail.com";
|
||||
github = "swdunlop";
|
||||
name = "Scott W. Dunlop";
|
||||
};
|
||||
swflint = {
|
||||
email = "swflint@flintfam.org";
|
||||
github = "swflint";
|
||||
|
||||
@ -17,8 +17,8 @@
|
||||
<para>
|
||||
If you encounter problems, please report them on the
|
||||
<literal
|
||||
xlink:href="https://groups.google.com/forum/#!forum/nix-devel">nix-devel</literal>
|
||||
mailing list or on the <link
|
||||
xlink:href="https://discourse.nixos.org">Discourse</literal>
|
||||
or on the <link
|
||||
xlink:href="irc://irc.freenode.net/#nixos">
|
||||
<literal>#nixos</literal> channel on Freenode</link>. Bugs should be
|
||||
reported in
|
||||
|
||||
@ -524,6 +524,8 @@ in {
|
||||
utmp.gid = ids.gids.utmp;
|
||||
adm.gid = ids.gids.adm;
|
||||
input.gid = ids.gids.input;
|
||||
kvm.gid = ids.gids.kvm;
|
||||
render.gid = ids.gids.render;
|
||||
};
|
||||
|
||||
system.activationScripts.users = stringAfter [ "stdio" ]
|
||||
|
||||
@ -318,7 +318,7 @@ in
|
||||
options = [ "allow_other" "cow" "nonempty" "chroot=/mnt-root" "max_files=32768" "hide_meta_files" "dirs=/nix/.rw-store=rw:/nix/.ro-store=ro" ];
|
||||
};
|
||||
|
||||
boot.initrd.availableKernelModules = [ "squashfs" "iso9660" "usb-storage" "uas" ];
|
||||
boot.initrd.availableKernelModules = [ "squashfs" "iso9660" "uas" ];
|
||||
|
||||
boot.blacklistedKernelModules = [ "nouveau" ];
|
||||
|
||||
|
||||
@ -326,6 +326,8 @@
|
||||
cfssl = 299;
|
||||
cassandra = 300;
|
||||
qemu-libvirtd = 301;
|
||||
# kvm = 302; # unused
|
||||
# render = 303; # unused
|
||||
|
||||
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
|
||||
|
||||
@ -612,6 +614,8 @@
|
||||
cfssl = 299;
|
||||
cassandra = 300;
|
||||
qemu-libvirtd = 301;
|
||||
kvm = 302; # default udev rules from systemd requires these
|
||||
render = 303; # default udev rules from systemd requires these
|
||||
|
||||
# When adding a gid, make sure it doesn't match an existing
|
||||
# uid. Users and groups with the same name should have equal
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
|
||||
# USB support, especially for booting from USB CD-ROM
|
||||
# drives.
|
||||
"usb_storage"
|
||||
"uas"
|
||||
|
||||
# Firewire support. Not tested.
|
||||
"ohci1394" "sbp2"
|
||||
|
||||
@ -11,7 +11,7 @@ let
|
||||
api_key = "";
|
||||
confd_path = "/etc/datadog-agent/conf.d";
|
||||
additional_checksd = "/etc/datadog-agent/checks.d";
|
||||
use_dogstatsd = "yes";
|
||||
use_dogstatsd = true;
|
||||
}
|
||||
// optionalAttrs (cfg.logLevel != null) { log_level = cfg.logLevel; }
|
||||
// optionalAttrs (cfg.hostname != null) { inherit (cfg) hostname; }
|
||||
|
||||
@ -18,9 +18,6 @@ import ./make-test.nix ({ pkgs, ... }:
|
||||
enable = true;
|
||||
logPerVirtualHost = true;
|
||||
adminAddr="js@lastlog.de";
|
||||
extraModules = [
|
||||
{ name = "php7"; path = "${pkgs.php}/modules/libphp7.so"; }
|
||||
];
|
||||
|
||||
virtualHosts = [
|
||||
{
|
||||
@ -30,7 +27,7 @@ import ./make-test.nix ({ pkgs, ... }:
|
||||
{
|
||||
serviceType = "wordpress";
|
||||
dbPassword = "wordpress";
|
||||
wordpressUploads = "/data/uploads";
|
||||
dbHost = "127.0.0.1";
|
||||
languages = [ "de_DE" "en_GB" ];
|
||||
}
|
||||
];
|
||||
|
||||
@ -34,9 +34,10 @@ stdenv.mkDerivation rec {
|
||||
cp ${gnu-config}/config.guess configure.guess
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://xiph.org/paranoia;
|
||||
description = "A tool and library for reading digital audio from CDs";
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
license = with licenses; [ gpl2Plus lgpl21Plus ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,13 +2,14 @@
|
||||
, pkgconfig, premake3, xorg, ladspa-sdk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "distrho-ports-unstable-2018-01-01";
|
||||
name = "distrho-ports-${version}";
|
||||
version = "2018-04-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DISTRHO";
|
||||
repo = "DISTRHO-Ports";
|
||||
rev = "b200e7409aa9f6612c4d948932f6ce6f0a087f5a";
|
||||
sha256 = "0672r0a9s6skzkxpjdraziwh5k8ivrfzvi4zcpkcg3zrv2hia2vz";
|
||||
rev = version;
|
||||
sha256 = "0l4zwl4mli8jzch32a1fh7c88r9q17xnkxsdw17ds5hadnxlk12v";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
@ -46,6 +47,6 @@ stdenv.mkDerivation rec {
|
||||
TAL-Vocoder-2 TheFunction ThePilgrim Vex Wolpertinger
|
||||
'';
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
platforms = platforms.linux;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "drumkv1-${version}";
|
||||
version = "0.9.0";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
|
||||
sha256 = "1vm8lrk3lykdic6fyfpl12jx1xg6rcaid242s8sij30p1ix4zdab";
|
||||
sha256 = "1z9l43z91d01b9rzam2cj9qmmg6s5y65fjvb83ms4iaa1p0mnwrn";
|
||||
};
|
||||
|
||||
buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ];
|
||||
|
||||
@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = https://xiph.org/flac/;
|
||||
description = "Library and tools for encoding and decoding the FLAC lossless audio file format";
|
||||
platforms = platforms.all;
|
||||
maintainers = [ ];
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, avahi, bluez, boost, eigen, fftw, glib, glib-networking
|
||||
, glibmm, gsettings-desktop-schemas, gtkmm2, libjack2
|
||||
, ladspaH, libav, librdf, libsndfile, lilv, lv2, serd, sord, sratom
|
||||
, wrapGAppsHook, zita-convolver, zita-resampler
|
||||
, wrapGAppsHook, zita-convolver, zita-resampler, curl
|
||||
, optimizationSupport ? false # Enable support for native CPU extensions
|
||||
}:
|
||||
|
||||
@ -12,11 +12,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "guitarix-${version}";
|
||||
version = "0.37.1";
|
||||
version = "0.37.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz";
|
||||
sha256 = "064k0jzxqgx9gwf8za6jziansabzrwzjaim3qx1743ify5g3gaai";
|
||||
sha256 = "1wfm8wrwrnqpb4ihy75n7l9i6vml536jlq9pdx2pblbc4ba3paac";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ];
|
||||
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
avahi bluez boost eigen fftw glib glibmm glib-networking.out
|
||||
gsettings-desktop-schemas gtkmm2 libjack2 ladspaH libav librdf
|
||||
libsndfile lilv lv2 serd sord sratom zita-convolver
|
||||
zita-resampler
|
||||
zita-resampler curl
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "Mopidy-Iris";
|
||||
version = "3.23.2";
|
||||
version = "3.24.0";
|
||||
|
||||
src = pythonPackages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1zf4ck19z3nh1x9a847ay1qnkyvi6s6866kp6q6dh1xpn7i9rmx7";
|
||||
sha256 = "19aympbkiil68j9jpvk1pgl4hplfs0vpc0d4vmzmpbcslkpirx2g";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "padthv1-${version}";
|
||||
version = "0.9.0";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/padthv1/${name}.tar.gz";
|
||||
sha256 = "0c519qk2g0dk8gqf9ywqfp7dnr4b25lsnxxbf2l1spnnvf8nysvh";
|
||||
sha256 = "1alfl0l5qdll0w5lwhrwzj5dina1big1zmjg5imi9h06dzhz51xl";
|
||||
};
|
||||
|
||||
buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "praat-${version}";
|
||||
version = "6.0.40";
|
||||
version = "6.0.42";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/praat/praat/archive/v${version}.tar.gz";
|
||||
sha256 = "168qrrr59qxii265vba7pj6f61lzq5lk9c43zcda0wmmjp87bq1x";
|
||||
sha256 = "1llcj1cq4k60lnr6jkdshd4l9nkg9yc2xmaqiinqryxrb58jmpcv";
|
||||
};
|
||||
|
||||
configurePhase = ''
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "samplv1-${version}";
|
||||
version = "0.9.0";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/samplv1/${name}.tar.gz";
|
||||
sha256 = "0g67vm9ilmq5nlvk0f3abia9pbinr4ck5v4mll6igni1rxz2n7wk";
|
||||
sha256 = "0rfcp4v971qfhw1hb43hw12wlxmg2q13l0m1h93pyfi5l4mfjkds";
|
||||
};
|
||||
|
||||
buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "synthv1-${version}";
|
||||
version = "0.9.0";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/synthv1/${name}.tar.gz";
|
||||
sha256 = "1skynjg6ip0qfbqqkybfjh6xcwxagq89ghl08f7sp7j0sz5qdcwp";
|
||||
sha256 = "1r60l286n8y4a4rrlnbc3h7xk4s2pvqykvskls89prxg0lkpz7kl";
|
||||
};
|
||||
|
||||
buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ];
|
||||
|
||||
@ -13,14 +13,14 @@ let
|
||||
sha256Hash = "0xx6yprylmcb32ipmwdcfkgddlm1nrxi1w68miclvgrbk015brf2";
|
||||
};
|
||||
betaVersion = {
|
||||
version = "3.2.0.22"; # "Android Studio 3.2 Beta 5"
|
||||
build = "181.4913314";
|
||||
sha256Hash = "016nyn1pqviy089hg0dq7m4cqb39fdxdcy4zknkaq7dmgv1dj6x9";
|
||||
version = "3.2.0.23"; # "Android Studio 3.2 RC 1"
|
||||
build = "181.4963425";
|
||||
sha256Hash = "0b3mmafpnc07chiy3fv3vlrarkiwbb0c62x3qk26kpxq1l6m8bgw";
|
||||
};
|
||||
latestVersion = { # canary & dev
|
||||
version = "3.3.0.5"; # "Android Studio 3.3 Canary 6"
|
||||
build = "182.4954005";
|
||||
sha256Hash = "0b8ias75f3p5nrmgp7iqz4n4r4dbwhgagqmyc1fqfd36wbglyaf4";
|
||||
version = "3.3.0.6"; # "Android Studio 3.3 Canary 7"
|
||||
build = "182.4968538";
|
||||
sha256Hash = "159sya24p99pj9q0mj1sbcz2609ackz54x4pj3q1mxhiamsn1y2q";
|
||||
};
|
||||
in rec {
|
||||
# Old alias
|
||||
|
||||
@ -249,12 +249,12 @@ in
|
||||
|
||||
clion = buildClion rec {
|
||||
name = "clion-${version}";
|
||||
version = "2018.2.1"; /* updated by script */
|
||||
version = "2018.2.2"; /* updated by script */
|
||||
description = "C/C++ IDE. New. Intelligent. Cross-platform";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
|
||||
sha256 = "16fr5760nkzgx8785x6hh7s96x097y6vdx7w1f9ipg71vv25cscq"; /* updated by script */
|
||||
sha256 = "1wjrki0awjyjmv7hh5rkhbpx40yqjssgh4nv61fvg189aric4rzj"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-clion";
|
||||
update-channel = "CLion Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
|
||||
@ -262,12 +262,12 @@ in
|
||||
|
||||
datagrip = buildDataGrip rec {
|
||||
name = "datagrip-${version}";
|
||||
version = "2018.2.1"; /* updated by script */
|
||||
version = "2018.2.2"; /* updated by script */
|
||||
description = "Your Swiss Army Knife for Databases and SQL";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
|
||||
sha256 = "1jfkxr790wr8ffn7ph694hfzahs2akjcfk4rfsvjv1dccqb0167k"; /* updated by script */
|
||||
sha256 = "0sfcl6bcq5hzwx1fdn8zfyl4qqjcmjmzwspa7v7niyqhbj5zdba9"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-datagrip";
|
||||
update-channel = "DataGrip 2018.2";
|
||||
@ -288,12 +288,12 @@ in
|
||||
|
||||
idea-community = buildIdea rec {
|
||||
name = "idea-community-${version}";
|
||||
version = "2018.2.1"; /* updated by script */
|
||||
version = "2018.2.2"; /* updated by script */
|
||||
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
|
||||
sha256 = "04dqyzkkrwvcdy1raard77v2315d44h29cpc9p98bjidvjd6bhsx"; /* updated by script */
|
||||
sha256 = "1495zkccss1bkh803p6065nypqj72zra9dbnlx3iz4kkbawr7j15"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-idea-ce";
|
||||
update-channel = "IntelliJ IDEA Release";
|
||||
@ -301,12 +301,12 @@ in
|
||||
|
||||
idea-ultimate = buildIdea rec {
|
||||
name = "idea-ultimate-${version}";
|
||||
version = "2018.2.1"; /* updated by script */
|
||||
version = "2018.2.2"; /* updated by script */
|
||||
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz";
|
||||
sha256 = "0ydidg9pk8bqf5jb1z0fw2m88v6mi38b4ddgmh5c9d9p44g6mddv"; /* updated by script */
|
||||
sha256 = "04jzsmnfmxxf264dla6scshk576z8w8sv78mpzb2mc1ndwviwflx"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-idea";
|
||||
update-channel = "IntelliJ IDEA Release";
|
||||
@ -314,12 +314,12 @@ in
|
||||
|
||||
phpstorm = buildPhpStorm rec {
|
||||
name = "phpstorm-${version}";
|
||||
version = "2018.2.1"; /* updated by script */
|
||||
version = "2018.2.2"; /* updated by script */
|
||||
description = "Professional IDE for Web and PHP developers";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
|
||||
sha256 = "042qhdkl4v5q4cdbqfbiwj6s3acivdb5kmbyn4jix8pg8r37yfnm"; /* updated by script */
|
||||
sha256 = "1sjxavkfjg4g9rgjqjjb9d6wg53dwfs8n65w3qbp87c7x3pl006r"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-phpstorm";
|
||||
update-channel = "PhpStorm 2018.2";
|
||||
@ -327,12 +327,12 @@ in
|
||||
|
||||
pycharm-community = buildPycharm rec {
|
||||
name = "pycharm-community-${version}";
|
||||
version = "2018.2.1"; /* updated by script */
|
||||
version = "2018.2.2"; /* updated by script */
|
||||
description = "PyCharm Community Edition";
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/python/${name}.tar.gz";
|
||||
sha256 = "14vnwqk0x0anvzmdv2ddc3qc9g5fll2ql02mi12k425j30fl2z2q"; /* updated by script */
|
||||
sha256 = "0nq4xwqczppdrswi826yzjdzqpiwl4iyi70d7g6ncqd9wyiay4z4"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-pycharm-ce";
|
||||
update-channel = "PyCharm Release";
|
||||
@ -340,12 +340,12 @@ in
|
||||
|
||||
pycharm-professional = buildPycharm rec {
|
||||
name = "pycharm-professional-${version}";
|
||||
version = "2018.2.1"; /* updated by script */
|
||||
version = "2018.2.2"; /* updated by script */
|
||||
description = "PyCharm Professional Edition";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/python/${name}.tar.gz";
|
||||
sha256 = "1h4f9l577w2ps0y79x79yhpbrsv3j5nwr1lr1890phmp6zri6wyf"; /* updated by script */
|
||||
sha256 = "1cf8z1wb532qhxlf0z4d791x084drfxzlaxq28hzy4f450bqbkp7"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-pycharm";
|
||||
update-channel = "PyCharm Release";
|
||||
@ -353,15 +353,15 @@ in
|
||||
|
||||
rider = buildRider rec {
|
||||
name = "rider-${version}";
|
||||
version = "2018.1.3"; /* updated by script */
|
||||
version = "2018.2"; /* updated by script */
|
||||
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
|
||||
sha256 = "00wskr60mjipyp44wrpc3pn6awc92djn7rwhc08nrar3zv0j4mgg"; /* updated by script */
|
||||
sha256 = "0yigw9g53i6xamwva8vcd38f0aysxqkf77avms4l7l63dkap99nq"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-rider";
|
||||
update-channel = "Rider 2018.1.3";
|
||||
update-channel = "Rider 2018.2";
|
||||
};
|
||||
|
||||
ruby-mine = buildRubyMine rec {
|
||||
@ -379,12 +379,12 @@ in
|
||||
|
||||
webstorm = buildWebStorm rec {
|
||||
name = "webstorm-${version}";
|
||||
version = "2018.2.1"; /* updated by script */
|
||||
version = "2018.2.2"; /* updated by script */
|
||||
description = "Professional IDE for Web and JavaScript development";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
|
||||
sha256 = "1jbzkp13qn4n58kbcsszm2gfnywjma2yvn48g0vi14v7x6zihhxd"; /* updated by script */
|
||||
sha256 = "1a31q7wrg4ihap8j6n2cg98ml1zic78drkrp0p554rgsnh7v4hwr"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-webstorm";
|
||||
update-channel = "WebStorm Release";
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "neovim-qt-${version}";
|
||||
version = "0.2.8";
|
||||
version = "0.2.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "equalsraf";
|
||||
repo = "neovim-qt";
|
||||
rev = "v${version}";
|
||||
sha256 = "190yg6kkw953h8wajlqr2hvs2fz65y6z0blmywlg1nff724allaq";
|
||||
sha256 = "014zqfbbv7q85z64h1iw88l37vhrvhjv7xxd0a76j7d1m2769kqs";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "OpenOrienteering-Mapper-${version}";
|
||||
version = "0.8.1.2";
|
||||
version = "0.8.2";
|
||||
|
||||
buildInputs = [ gdal qtbase qttools qtlocation qtimageformats
|
||||
qtsensors clipper zlib proj doxygen cups];
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "OpenOrienteering";
|
||||
repo = "mapper";
|
||||
rev = "v${version}";
|
||||
sha256 = "0f7zxzl2n46qy86k6n3f6a7l1nhba58i28l8ngp3drf74qffaa33";
|
||||
sha256 = "02lga6nlal4c7898zc3lv1pcwyv1wpkn7v2xji2kgq68r6aw6j59";
|
||||
};
|
||||
|
||||
cmakeFlags =
|
||||
|
||||
@ -84,6 +84,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = http://www.imagemagick.org/;
|
||||
description = "A software suite to create, edit, compose, or convert bitmap images";
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ the-kenny wkennington ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -10,7 +10,10 @@ stdenv.mkDerivation {
|
||||
|
||||
buildInputs = [unzip];
|
||||
|
||||
meta = {
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
meta = with stdenv.lib; {
|
||||
description = "Java based toolkit for handling SVG";
|
||||
homepage = https://xmlgraphics.apache.org/batik;
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -28,10 +28,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Gnome Diagram drawing software";
|
||||
homepage = http://live.gnome.org/Dia;
|
||||
maintainers = with stdenv.lib.maintainers; [raskin];
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -26,6 +26,9 @@ stdenv.mkDerivation rec {
|
||||
homepage = https://github.com/mattes/epeg;
|
||||
description = "Insanely fast JPEG/ JPG thumbnail scaling";
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
license = {
|
||||
url = "https://github.com/mattes/epeg#license";
|
||||
};
|
||||
maintainers = with maintainers; [ nh2 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -18,9 +18,10 @@ stdenv.mkDerivation {
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "A fast image viewer";
|
||||
homepage = http://gqview.sourceforge.net;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl3;
|
||||
};
|
||||
}
|
||||
|
||||
@ -17,10 +17,11 @@ stdenv.mkDerivation (rec {
|
||||
substituteInPlace Makefile --replace /man/ /share/man/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Quick image viewer";
|
||||
homepage = http://spiegl.de/qiv/;
|
||||
inherit version;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@ -4,13 +4,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "clipmenu-${version}";
|
||||
version = "5.4.0";
|
||||
version = "5.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cdown";
|
||||
repo = "clipmenu";
|
||||
rev = version;
|
||||
sha256 = "1qbpca0wny6i222vbikfl2znn3fynhbl4100qs8v4wn27ra5p0mi";
|
||||
sha256 = "15if7bwqviyynbrcwrn04r418cfnxf2mkmq112696np24bggvljg";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
@ -26,13 +26,13 @@ with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "keepassxc-${version}";
|
||||
version = "2.3.3";
|
||||
version = "2.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "keepassxreboot";
|
||||
repo = "keepassxc";
|
||||
rev = "${version}";
|
||||
sha256 = "08cj1nxbjy2m80h3irnra2qha7fc5ahhzcgkyk9jv4zyys9xv998";
|
||||
sha256 = "1gja402dsbws4z8ybnhqbw7rc9svgqnshqjgf7158d6x0ni386m3";
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [
|
||||
|
||||
@ -1,30 +1,58 @@
|
||||
{ stdenv, fetchsvn, pkgconfig, gtk2, SDL, fontconfig, freetype, imlib2, SDL_image, libGLU_combined,
|
||||
libXmu, freeglut, python, gettext, quesoglc, gd, postgresql, cmake, qt4, SDL_ttf, fribidi}:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "navit-svn-3537";
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, gtk2, SDL, fontconfig, freetype, imlib2, SDL_image, libGLU_combined,
|
||||
libXmu, freeglut, pcre, dbus-glib, glib, librsvg, freeimage, libxslt,
|
||||
qtbase, qtquickcontrols, qtsvg, qtdeclarative, qtlocation, qtsensors, qtmultimedia, qtspeech, espeak,
|
||||
cairo, gdk_pixbuf, pango, atk, patchelf, fetchurl, bzip2,
|
||||
python, gettext, quesoglc, gd, postgresql, cmake, shapelib, SDL_ttf, fribidi}:
|
||||
|
||||
src = fetchsvn {
|
||||
url = svn://svn.code.sf.net/p/navit/code/trunk/navit;
|
||||
rev = 5576;
|
||||
sha256 = "1xx62l5srfhh9cfi7n3pxj8hpcgr1rpa0hzfmbrqadzv09z36723";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "navit-${version}";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "navit-gps";
|
||||
repo = "navit";
|
||||
rev = "v${version}";
|
||||
sha256 = "0jf2gjh2sszr5y5c2wvamfj2qggi2y5k3ynb32pak9vhf5xyl5xj";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
buildInputs = [ gtk2 SDL fontconfig freetype imlib2 SDL_image libGLU_combined
|
||||
libXmu freeglut python gettext quesoglc gd postgresql qt4 SDL_ttf fribidi ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig cmake ];
|
||||
sample_map = fetchurl {
|
||||
url = "http://www.navit-project.org/maps/osm_bbox_11.3,47.9,11.7,48.2.osm.bz2";
|
||||
name = "sample_map.bz2";
|
||||
sha256 = "0vg6b6rhsa2cxqj4rbhfhhfss71syhnfa6f1jg2i2d7l88dm5x7d";
|
||||
};
|
||||
|
||||
#hardeningDisable = [ "format" ];
|
||||
NIX_CFLAGS_COMPILE = [ "-I${SDL.dev}/include/SDL" ];
|
||||
|
||||
cmakeFlags = [ "-DSAMPLE_MAP=n" ];
|
||||
# TODO: fix speech options.
|
||||
cmakeFlags = [ "-DSAMPLE_MAP=n " "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-Dsupport/espeak=FALSE" "-Dspeech/qt5_espeak=FALSE" ];
|
||||
|
||||
meta = {
|
||||
homepage = http://www.navit-project.org/;
|
||||
buildInputs = [ gtk2 SDL fontconfig freetype imlib2 SDL_image libGLU_combined freeimage libxslt
|
||||
libXmu freeglut python gettext quesoglc gd postgresql qtbase SDL_ttf fribidi pcre qtquickcontrols
|
||||
espeak qtmultimedia qtspeech qtsensors qtlocation qtdeclarative qtsvg dbus-glib librsvg shapelib glib
|
||||
cairo gdk_pixbuf pango atk ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig cmake patchelf bzip2 ];
|
||||
|
||||
# we dont want blank screen by defaut
|
||||
postInstall = ''
|
||||
# emulate DSAMPLE_MAP
|
||||
mkdir -p $out/share/navit/maps/maps
|
||||
bzcat "${sample_map}" | $out/bin/maptool "$out/share/navit/maps/osm_bbox_11.3,47.9,11.7,48.2.bin"
|
||||
'';
|
||||
|
||||
# TODO: fix upstream?
|
||||
postFixup = ''
|
||||
for lib in $(find "$out/lib/navit/" -iname "*.so" ); do
|
||||
patchelf --set-rpath ${stdenv.lib.makeLibraryPath buildInputs} $lib
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.navit-project.org;
|
||||
description = "Car navigation system with routing engine using OSM maps";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = with stdenv.lib.maintainers; [ ];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.genesis ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xpad-${version}";
|
||||
version = "5.0.0";
|
||||
version = "5.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launchpad.net/xpad/trunk/${version}/+download/xpad-${version}.tar.bz2";
|
||||
sha256 = "02yikxg6z9bwla09ka001ppjlpbv5kbza3za9asazm5aiz376mkb";
|
||||
sha256 = "0l0g5x8g6dwhf5ksnqqrjjsycy57kcvdslkmsr6bl3vrsjd7qml3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ];
|
||||
|
||||
@ -82,8 +82,8 @@ let
|
||||
xdg_utils yasm minizip libwebp
|
||||
libusb1 re2 zlib
|
||||
ffmpeg libxslt libxml2
|
||||
# harfbuzz-icu # in versions over 63 harfbuzz and freetype are being built together
|
||||
# so we can't build with one from system and other from source
|
||||
# harfbuzz # in versions over 63 harfbuzz and freetype are being built together
|
||||
# so we can't build with one from system and other from source
|
||||
];
|
||||
|
||||
# build paths and release info
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -185,7 +185,7 @@ stdenv.mkDerivation (rec {
|
||||
"--disable-gconf"
|
||||
"--enable-default-toolkit=${default-toolkit}"
|
||||
]
|
||||
++ lib.optional stdenv.isDarwin "--disable-xcode-checks"
|
||||
++ lib.optional (stdenv.isDarwin && lib.versionAtLeast version "61") "--disable-xcode-checks"
|
||||
++ lib.optional (lib.versionOlder version "61") "--enable-system-hunspell"
|
||||
++ lib.optionals (lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [
|
||||
# on i686-linux: --with-libclang-path is not available in this configuration
|
||||
|
||||
@ -1,17 +1,19 @@
|
||||
{ fetchurl, stdenv, jre, glib, libXtst, gtk2, makeWrapper }:
|
||||
{ fetchurl, stdenv, jre, glib, libXtst, gtk2, makeWrapper, unzip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "davmail-4.8.0";
|
||||
name = "davmail-4.8.6";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/davmail/4.8.0/davmail-linux-x86_64-4.8.0-2479.tgz";
|
||||
sha256 = "0e650c4a060d64fd2b270ddb00baa906aac617865d5e60c9f526a281cdb27b62";
|
||||
url = "mirror://sourceforge/davmail/4.8.6/davmail-4.8.6-2600.zip";
|
||||
sha256 = "1wk4jxb46qlyipxj57flqadgm4mih243rhqq9sp9m5pifjqrw9dp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
sourceRoot = ".";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper unzip ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/davmail
|
||||
cp -R ./* $out/share/davmail
|
||||
cp -vR ./* $out/share/davmail
|
||||
makeWrapper $out/share/davmail/davmail.sh $out/bin/davmail \
|
||||
--prefix PATH : ${jre}/bin \
|
||||
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]}
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, libGL, xcbutilkeysyms, xdg_utils, libtool }:
|
||||
|
||||
let
|
||||
version = "4.30.5.1676";
|
||||
version = "4.30.5.1682";
|
||||
|
||||
rpath = stdenv.lib.makeLibraryPath [
|
||||
xdg_utils
|
||||
@ -43,7 +43,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb";
|
||||
sha256 = "1fmvarq7zf1cnah2d1l7rxhbiw3dmjcxsldys5is63y204hdh04y";
|
||||
sha256 = "03pz8wskafn848yvciq29kwdvqcgjrk6sjnm8nk9acl89xf0sn96";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchurl, pidgin, intltool, libxml2, nss, nspr }:
|
||||
|
||||
let version = "1.23.2"; in
|
||||
let version = "1.23.3"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "pidgin-sipe-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/sipe/pidgin-sipe-${version}.tar.gz";
|
||||
sha256 = "1xj4nn5h103q4agar167xwcp98qf8knrgs918nl07qaxp9g4558w";
|
||||
sha256 = "0aaiblnagncb0lhdwb8qbps6hxxmyfjg7sdi15lrkl98i3fahg4n";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.2.31.2";
|
||||
version = "1.2.31.3";
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "remmina";
|
||||
@ -29,7 +29,7 @@ in stdenv.mkDerivation {
|
||||
owner = "Remmina";
|
||||
repo = "Remmina";
|
||||
rev = "v${version}";
|
||||
sha256 = "09jdrs2hbr9wyd5yqw5bri41rnfnxxyh98mlv6ig2phlvs9cg73d";
|
||||
sha256 = "0lvang4587wz292c3k3s8n4icc25cia1phmij34ndrl1f9lg34dp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools,
|
||||
mkDerivation, lib, fetchurl, fetchpatch, extra-cmake-modules, kdoctools,
|
||||
boost, qttools, qtwebkit,
|
||||
breeze-icons, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
|
||||
kcrash, kguiaddons, ki18n, kiconthemes, kitemviews, kio, ktexteditor, ktextwidgets,
|
||||
@ -29,6 +29,13 @@ mkDerivation rec {
|
||||
|
||||
propagatedUserEnvPkgs = [ kproperty ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://phabricator.kde.org/file/data/6iwzltiifyqwjnzbvyo6/PHID-FILE-li4a7j35wkdkm2qdtnp4/D11503.diff";
|
||||
sha256 = "0yj717m4x1zb4xjy1ayhz78xkxpawxgsvjgvf5iw81jnlr8absq9";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A open source visual database applications creator, a long-awaited competitor for programs like MS Access or Filemaker";
|
||||
longDescription = ''
|
||||
|
||||
57
pkgs/applications/office/todoman/default.nix
Normal file
57
pkgs/applications/office/todoman/default.nix
Normal file
@ -0,0 +1,57 @@
|
||||
{ stdenv, python3, glibcLocales }:
|
||||
|
||||
let
|
||||
inherit (python3.pkgs) buildPythonApplication fetchPypi;
|
||||
in
|
||||
buildPythonApplication rec {
|
||||
pname = "todoman";
|
||||
version = "3.4.0";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "09441fdrwz2irsbrxnpwys51372z6rn6gnxn87p95r3fv9gmh0fw";
|
||||
};
|
||||
|
||||
LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux
|
||||
"${glibcLocales}/lib/locale/locale-archive";
|
||||
LANG = "en_US.UTF-8";
|
||||
LC_TYPE = "en_US.UTF-8";
|
||||
|
||||
buildInputs = [ glibcLocales ];
|
||||
propagatedBuildInputs = with python3.pkgs;
|
||||
[ atomicwrites click click-log configobj humanize icalendar parsedatetime
|
||||
python-dateutil pyxdg tabulate urwid ];
|
||||
|
||||
checkInputs = with python3.pkgs;
|
||||
[ flake8 flake8-import-order freezegun hypothesis pytest pytestrunner pytestcov ];
|
||||
|
||||
makeWrapperArgs = [ "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive"
|
||||
"--set CHARSET en_us.UTF-8" ];
|
||||
|
||||
preCheck = ''
|
||||
# Remove one failing test that only checks whether the command line works
|
||||
rm tests/test_main.py
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/pimutils/todoman;
|
||||
description = "Standards-based task manager based on iCalendar";
|
||||
longDescription = ''
|
||||
Todoman is a simple, standards-based, cli todo (aka: task) manager. Todos
|
||||
are stored into icalendar files, which means you can sync them via CalDAV
|
||||
using, for example, vdirsyncer.
|
||||
|
||||
Todos are read from individual ics files from the configured directory.
|
||||
This matches the vdir specification. There’s support for the most common TODO
|
||||
features for now (summary, description, location, due date and priority) for
|
||||
now. Runs on any Unix-like OS. It’s been tested on GNU/Linux, BSD and macOS.
|
||||
Unsupported fields may not be shown but are never deleted or altered.
|
||||
|
||||
Todoman is part of the pimutils project
|
||||
'';
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ leenaars ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -14,10 +14,10 @@ with stdenv.lib;
|
||||
|
||||
python2Packages.buildPythonApplication rec {
|
||||
pname = "tryton";
|
||||
version = "4.8.4";
|
||||
version = "4.8.5";
|
||||
src = python2Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "6cf3091424853e1270d61f3a9b15ad8e6b36a44c28becf216c324ca8dc1474b0";
|
||||
sha256 = "43759d22b061a7a392a534d19a045fafd442ce98a0e390ee830127367dcaf4b4";
|
||||
};
|
||||
nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
|
||||
propagatedBuildInputs = with python2Packages; [
|
||||
|
||||
@ -5,10 +5,10 @@ with stdenv.lib;
|
||||
|
||||
python2Packages.buildPythonApplication rec {
|
||||
pname = "trytond";
|
||||
version = "4.8.3";
|
||||
version = "4.8.4";
|
||||
src = python2Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "11d01dc984d9274229b5c80f883679d130a55e14e9124b051274fce9aea4ef77";
|
||||
sha256 = "1935045b1b4674de602b4279a9cfd0a14431624a28ccb490234cffecb81fbca7";
|
||||
};
|
||||
|
||||
# Tells the tests which database to use
|
||||
|
||||
@ -0,0 +1,31 @@
|
||||
{ stdenv, fetchurl, jre, makeWrapper, unzip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "astrolabe-generator-${version}";
|
||||
version = "3.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/wymarc/astrolabe-generator/releases/download/v${version}/AstrolabeGenerator-${version}.zip";
|
||||
sha256 = "141gfmrqa1mf2qas87qig4phym9fg9gbrcfl2idzd5gi91824dn9";
|
||||
};
|
||||
|
||||
buildInputs = [ jre ];
|
||||
nativeBuildInputs = [ makeWrapper unzip ];
|
||||
sourceRoot = ".";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/{bin,share/java}
|
||||
cp AstrolabeGenerator-${version}.jar $out/share/java
|
||||
|
||||
makeWrapper ${jre}/bin/java $out/bin/AstrolabeGenerator \
|
||||
--add-flags "-jar $out/share/java/AstrolabeGenerator-${version}.jar"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib;{
|
||||
homepage = https://www.astrolabeproject.com;
|
||||
description = "A Java-based tool for generating EPS files for constructing astrolabes and related tools";
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.genesis ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
44
pkgs/applications/science/robotics/apmplanner2/default.nix
Normal file
44
pkgs/applications/science/robotics/apmplanner2/default.nix
Normal file
@ -0,0 +1,44 @@
|
||||
{ stdenv, fetchFromGitHub, qmake
|
||||
, qtbase, qtscript, qtwebkit, qtserialport, qtsvg, qtdeclarative, qtquickcontrols2
|
||||
, alsaLib, libsndfile, flite, openssl, udev, SDL2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "apmplanner2-${version}";
|
||||
version = "2.0.26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ArduPilot";
|
||||
repo = "apm_planner";
|
||||
rev = "${version}";
|
||||
sha256 = "0bnyi1r8k8ij5sq2zqv7mfbrxm0xdw97qrx3sk4rinqv2g6h6di4";
|
||||
};
|
||||
|
||||
qtInputs = [
|
||||
qtbase qtscript qtwebkit qtserialport qtsvg qtdeclarative qtquickcontrols2
|
||||
];
|
||||
|
||||
buildInputs = [ alsaLib libsndfile flite openssl udev SDL2 ] ++ qtInputs;
|
||||
nativeBuildInputs = [ qmake ];
|
||||
|
||||
qmakeFlags = [ "apm_planner.pro" ];
|
||||
|
||||
# this ugly hack is necessary, as `bin/apmplanner2` needs the contents of `share/APMPlanner2` inside of `bin/`
|
||||
preFixup = ''
|
||||
ln --relative --symbolic $out/share/APMPlanner2/* $out/bin/
|
||||
substituteInPlace $out/share/applications/apmplanner2.desktop \
|
||||
--replace /usr $out
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "Ground station software for autonomous vehicles";
|
||||
longDescription = ''
|
||||
A GUI ground control station for autonomous vehicles using the MAVLink protocol.
|
||||
Includes support for the APM and PX4 based controllers.
|
||||
'';
|
||||
homepage = http://ardupilot.org/planner2/;
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
maintainers = [ stdenv.lib.maintainers.wucke13 ];
|
||||
};
|
||||
}
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "hub-${version}";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
|
||||
goPackagePath = "github.com/github/hub";
|
||||
|
||||
@ -10,7 +10,7 @@ buildGoPackage rec {
|
||||
owner = "github";
|
||||
repo = "hub";
|
||||
rev = "v${version}";
|
||||
sha256 = "03nj3b17m700l3pib9jlzxz2vh8w54srv6x63l53sb4dff3izfsz";
|
||||
sha256 = "0a5i351v998vdwf883qhh39c15x56db01fr9hscz4ha7r9550pqg";
|
||||
};
|
||||
|
||||
buildInputs = [ groff ronn ruby utillinux ] ++
|
||||
|
||||
@ -73,7 +73,7 @@
|
||||
|
||||
# Fix the desktop link
|
||||
substituteInPlace $out/share/applications/webtorrent-desktop.desktop \
|
||||
--replace /opt/webtorrent-desktop/WebTorrent $out/bin/WebTorrent
|
||||
--replace /opt/webtorrent-desktop $out/bin
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -198,13 +198,13 @@ rec {
|
||||
# https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/*
|
||||
|
||||
docker_18_06 = dockerGen rec {
|
||||
version = "18.06.0-ce";
|
||||
rev = "0ffa8257ec673ed6849b73b03fb01b0cac90fdb3"; # git commit
|
||||
sha256 = "1w6jgqbc53pkgfkf2p6z5g316q1r5jvnw4lq11j4qdkw7vy8q5d9";
|
||||
version = "18.06.1-ce";
|
||||
rev = "e68fc7a215d7133c34aa18e3b72b4a21fd0c6136"; # git commit
|
||||
sha256 = "1bqd6pv5hga4j1s8jm8q5qdnfbjf8lw1ghdk0bw9hhqkn7rcnrv4";
|
||||
runcRev = "69663f0bd4b60df09991c08812a60108003fa340";
|
||||
runcSha256 = "1l37r97l3ra4ph069w190d05r0a43s76nn9jvvlkbwrip1cp6gyq";
|
||||
containerdRev = "d64c661f1d51c48782c9cec8fda7604785f93587";
|
||||
containerdSha256 = "0pk1kii8bmlvziblrqwb88w5cd486pmb7vw8p7kcyn9lqsw32ria";
|
||||
containerdRev = "468a545b9edcd5932818eb9de8e72413e616e86e";
|
||||
containerdSha256 = "1rp015cm5fw9kfarcmfhfkr1sh0iz7kvqls6f8nfhwrrz5armd5v";
|
||||
tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662";
|
||||
tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn";
|
||||
};
|
||||
|
||||
27
pkgs/data/fonts/aileron/default.nix
Normal file
27
pkgs/data/fonts/aileron/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ stdenv, fetchzip }:
|
||||
|
||||
let
|
||||
majorVersion = "0";
|
||||
minorVersion = "102";
|
||||
pname = "aileron";
|
||||
in
|
||||
|
||||
fetchzip rec {
|
||||
name = "${pname}-font-${majorVersion}.${minorVersion}";
|
||||
|
||||
url = "http://dotcolon.net/DL/font/${pname}.zip";
|
||||
sha256 = "04xnzdy9plzd2p02yq367h37m5ygx0w8cpkdv39cc3754ljlsxim";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/opentype/${pname}
|
||||
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://dotcolon.net/font/${pname}/";
|
||||
description = "A helvetica font in nine weights";
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ leenaars ];
|
||||
license = licenses.cc0;
|
||||
};
|
||||
}
|
||||
27
pkgs/data/fonts/eunomia/default.nix
Normal file
27
pkgs/data/fonts/eunomia/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ stdenv, fetchzip }:
|
||||
|
||||
let
|
||||
majorVersion = "0";
|
||||
minorVersion = "200";
|
||||
pname = "eunomia";
|
||||
in
|
||||
|
||||
fetchzip rec {
|
||||
name = "${pname}-font-${majorVersion}.${minorVersion}";
|
||||
|
||||
url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip";
|
||||
sha256 = "0lpmczs1d4p9dy4s0dnvv7bl5cd0f6yzyasfrkxij5s86glps38b";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/opentype/${pname}
|
||||
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://dotcolon.net/font/eunomia/;
|
||||
description = "A futuristic decorative font.";
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ leenaars ];
|
||||
license = licenses.ofl;
|
||||
};
|
||||
}
|
||||
27
pkgs/data/fonts/f5_6/default.nix
Normal file
27
pkgs/data/fonts/f5_6/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ stdenv, fetchzip }:
|
||||
|
||||
let
|
||||
majorVersion = "0";
|
||||
minorVersion = "110";
|
||||
pname = "f5_6";
|
||||
in
|
||||
|
||||
fetchzip rec {
|
||||
name = "${pname}-font-${majorVersion}.${minorVersion}";
|
||||
|
||||
url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip";
|
||||
sha256 = "04p6lccd26rhjbpq3ddxi5vkk3lk8lqbpnk8lakjzixp3fgdqpp4";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/opentype/${pname}
|
||||
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://dotcolon.net/font/${pname}/";
|
||||
description = "A weighted decorative font.";
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ leenaars ];
|
||||
license = licenses.ofl;
|
||||
};
|
||||
}
|
||||
27
pkgs/data/fonts/ferrum/default.nix
Normal file
27
pkgs/data/fonts/ferrum/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ stdenv, fetchzip }:
|
||||
|
||||
let
|
||||
majorVersion = "0";
|
||||
minorVersion = "200";
|
||||
pname = "ferrum";
|
||||
in
|
||||
|
||||
fetchzip rec {
|
||||
name = "${pname}-font-${majorVersion}.${minorVersion}";
|
||||
|
||||
url = "http://dotcolon.net/DL/font/${pname}.zip";
|
||||
sha256 = "1w1b3ch7ik4264f05lxms01ls0aargvlx770a9szm682dfmizn8w";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/opentype/${pname}
|
||||
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://dotcolon.net/font/${pname}/";
|
||||
description = "A decorative font.";
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ leenaars ];
|
||||
license = licenses.cc0;
|
||||
};
|
||||
}
|
||||
32
pkgs/data/fonts/medio/default.nix
Normal file
32
pkgs/data/fonts/medio/default.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{ stdenv, fetchzip }:
|
||||
|
||||
let
|
||||
majorVersion = "0";
|
||||
minorVersion = "200";
|
||||
pname = "medio";
|
||||
in
|
||||
|
||||
fetchzip rec {
|
||||
name = "${pname}-font-${majorVersion}.${minorVersion}";
|
||||
|
||||
url = "http://dotcolon.net/DL/font/${pname}.zip";
|
||||
sha256 = "0gxcmhjlsh2pzsmj78vw4v935ax7hfk533ddlhfhfma52zyxyh7x";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/opentype/${pname}
|
||||
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://dotcolon.net/font/{pname}/";
|
||||
description = "Serif font designed by Sora Sagano";
|
||||
longDescription = ''
|
||||
Medio is a serif font designed by Sora Sagano, based roughly
|
||||
on the proportions of the font Tenderness (from the same designer),
|
||||
but with hairline serifs in the style of a Didone.
|
||||
'';
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ leenaars ];
|
||||
license = licenses.cc0;
|
||||
};
|
||||
}
|
||||
32
pkgs/data/fonts/penna/default.nix
Normal file
32
pkgs/data/fonts/penna/default.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{ stdenv, fetchzip }:
|
||||
|
||||
let
|
||||
majorVersion = "0";
|
||||
minorVersion = "10";
|
||||
pname = "penna";
|
||||
in
|
||||
|
||||
fetchzip rec {
|
||||
name = "${pname}-font-${majorVersion}.${minorVersion}";
|
||||
|
||||
url = "http://dotcolon.net/DL/font/${pname}.zip";
|
||||
sha256 = "0hk15yndm56l6rbdykpkry2flffx0567mgjcqcnsx1iyzwwla5km";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/opentype/${pname}
|
||||
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://dotcolon.net/font/{pname}/";
|
||||
description = "Geometric sans serif designed by Sora Sagano";
|
||||
longDescription = ''
|
||||
Penna is a geometric sans serif designed by Sora Sagano,
|
||||
with outsized counters in the uppercase and a lowercase
|
||||
with a small x-height.
|
||||
'';
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ leenaars ];
|
||||
license = licenses.cc0;
|
||||
};
|
||||
}
|
||||
27
pkgs/data/fonts/route159/default.nix
Normal file
27
pkgs/data/fonts/route159/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ stdenv, fetchzip }:
|
||||
|
||||
let
|
||||
majorVersion = "1";
|
||||
minorVersion = "10";
|
||||
pname = "route159";
|
||||
in
|
||||
|
||||
fetchzip rec {
|
||||
name = "${pname}-font-${majorVersion}.${minorVersion}";
|
||||
|
||||
url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip";
|
||||
sha256 = "1nv5csg73arvvwpac7ylh4j9n0s3qp79rbv2s4jvs2bf6gqhsq7h";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/opentype/${pname}
|
||||
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://dotcolon.net/font/{pname}/";
|
||||
description = "A weighted sans serif font";
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ leenaars ];
|
||||
license = licenses.ofl;
|
||||
};
|
||||
}
|
||||
37
pkgs/data/fonts/seshat/default.nix
Normal file
37
pkgs/data/fonts/seshat/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ stdenv, fetchzip }:
|
||||
|
||||
let
|
||||
majorVersion = "0";
|
||||
minorVersion = "100";
|
||||
pname = "seshat";
|
||||
in
|
||||
|
||||
fetchzip rec {
|
||||
name = "${pname}-font-${majorVersion}.${minorVersion}";
|
||||
|
||||
url = "http://dotcolon.net/DL/font/${pname}.zip";
|
||||
sha256 = "1zzgc2d0jrris92p3irmxjhdq8aj99alz0z7dlz25qf37lcilrir";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/opentype/${pname}
|
||||
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://dotcolon.net/font/{pname}/";
|
||||
description = "Roman body font designed for main text by Sora Sagano";
|
||||
longDescription = ''
|
||||
Seshat is a Roman body font designed for the main text. By
|
||||
referring to the classical balance, we changed some lines by
|
||||
omitting part of the lines such as "A" and "n".
|
||||
|
||||
Also, by attaching the strength of the thickness like Optima
|
||||
to the main drawing, it makes it more sharp design.
|
||||
|
||||
It incorporates symbols and ligatures used in the European region.
|
||||
'';
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ leenaars ];
|
||||
license = licenses.cc0;
|
||||
};
|
||||
}
|
||||
27
pkgs/data/fonts/tenderness/default.nix
Normal file
27
pkgs/data/fonts/tenderness/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ stdenv, fetchzip }:
|
||||
|
||||
let
|
||||
majorVersion = "0";
|
||||
minorVersion = "601";
|
||||
pname = "tenderness";
|
||||
in
|
||||
|
||||
fetchzip rec {
|
||||
name = "${pname}-font-${majorVersion}.${minorVersion}";
|
||||
|
||||
url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip";
|
||||
sha256 = "0d88l5mzq0k63zsmb8d5w3hfqxy04vpv4j0j8nmj1xv6kikhhybh";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/opentype/${pname}
|
||||
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://dotcolon.net/font/${pname}/";
|
||||
description = "Serif font designed by Sora Sagano with old-style figures";
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ leenaars ];
|
||||
license = licenses.ofl;
|
||||
};
|
||||
}
|
||||
@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchurl, makeWrapper, jre, unzip }:
|
||||
|
||||
let
|
||||
version = "1.2.60";
|
||||
version = "1.2.61";
|
||||
in stdenv.mkDerivation rec {
|
||||
inherit version;
|
||||
name = "kotlin-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
|
||||
sha256 = "0gb29a8ayj12g4g10dcasw3d3csphq5rv9jn9c6m02myr6azcygz";
|
||||
sha256 = "1gsvilsbgwdvyvxjnlvs0rhrgm6x9dapziwgwgg9kbi9a0w4avdy";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ jre ] ;
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
diff -Naur clang-3.4-orig/lib/Driver/Tools.cpp clang-3.4/lib/Driver/Tools.cpp
|
||||
--- clang-3.4-orig/lib/Driver/Tools.cpp 2013-12-08 21:59:27.000000000 -0500
|
||||
+++ clang-3.4/lib/Driver/Tools.cpp 2014-01-27 12:48:29.421872597 -0500
|
||||
@@ -6477,15 +6477,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");
|
||||
- CmdArgs.push_back(Args.MakeArgString(
|
||||
- D.DyldPrefix + getLinuxDynamicLinker(Args, ToolChain)));
|
||||
- }
|
||||
-
|
||||
CmdArgs.push_back("-o");
|
||||
CmdArgs.push_back(Output.getFilename());
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
diff -Naur clang-3.4-orig/tools/extra/CMakeLists.txt clang-3.4/tools/extra/CMakeLists.txt
|
||||
--- clang-3.4-orig/tools/extra/CMakeLists.txt 2013-11-07 19:08:23.000000000 -0500
|
||||
+++ clang-3.4/tools/extra/CMakeLists.txt 2014-01-20 11:47:22.678435223 -0500
|
||||
@@ -1,3 +1,4 @@
|
||||
+include(CheckLibraryExists)
|
||||
check_library_exists(edit el_init "" HAVE_LIBEDIT)
|
||||
|
||||
add_subdirectory(clang-apply-replacements)
|
||||
@ -1,56 +0,0 @@
|
||||
{ stdenv, fetch, cmake, libxml2, libedit, llvm, zlib, version, clang-tools-extra_src }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "clang-${version}";
|
||||
|
||||
unpackPhase = ''
|
||||
unpackFile ${fetch "cfe" "045wjnp5j8xd2zjhvldcllnwlnrwz3dafmlk412z804d5xvzb9jv"}
|
||||
mv cfe-${version}.src clang
|
||||
sourceRoot=$PWD/clang
|
||||
unpackFile ${clang-tools-extra_src}
|
||||
mv clang-tools-extra-* $sourceRoot/tools/extra
|
||||
# !!! Hopefully won't be needed for 3.5
|
||||
unpackFile ${llvm.src}
|
||||
export cmakeFlags="$cmakeFlags -DCLANG_PATH_TO_LLVM_SOURCE="`ls -d $PWD/llvm-*`
|
||||
(cd llvm-* && patch -Np1 -i ${./llvm-separate-build.patch})
|
||||
'';
|
||||
|
||||
patches = [ ./clang-separate-build.patch ./clang-purity.patch ];
|
||||
|
||||
buildInputs = [ cmake libedit libxml2 zlib ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_CXX_FLAGS=-std=c++11"
|
||||
"-DCLANG_PATH_TO_LLVM_BUILD=${llvm}"
|
||||
] ++
|
||||
(stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include") ++
|
||||
(stdenv.lib.optional (stdenv.cc.cc != null) "-DGCC_INSTALL_PREFIX=${stdenv.cc.cc}");
|
||||
|
||||
# Clang expects to find LLVMgold in its own prefix
|
||||
# Clang expects to find sanitizer libraries in its own prefix
|
||||
postInstall = ''
|
||||
if [ -e ${llvm}/lib/LLVMgold.so ]; then
|
||||
ln -sv ${llvm}/lib/LLVMgold.so $out/lib
|
||||
fi
|
||||
|
||||
ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
isClang = true;
|
||||
cc = stdenv.cc.cc;
|
||||
# GCC_INSTALL_PREFIX points here, so just use it even though it may not
|
||||
# actually be a gcc
|
||||
gcc = stdenv.cc.cc;
|
||||
hardeningUnsupportedFlags = [ "stackprotector" ];
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
|
||||
homepage = http://llvm.org/;
|
||||
license = stdenv.lib.licenses.ncsa;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@ -1,37 +0,0 @@
|
||||
{ newScope, stdenv, isl, fetchurl }:
|
||||
let
|
||||
callPackage = newScope (self // { inherit stdenv isl version fetch; });
|
||||
|
||||
version = "3.4";
|
||||
|
||||
fetch = fetch_v version;
|
||||
fetch_v = ver: name: sha256: fetchurl {
|
||||
url = "http://llvm.org/releases/${ver}/${name}-${ver}.src.tar.gz";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
compiler-rt_src = fetch "compiler-rt" "0p5b6varxdqn7q3n77xym63hhq4qqxd2981pfpa65r1w72qqjz7k";
|
||||
clang-tools-extra_src = fetch "clang-tools-extra" "1d1822mwxxl9agmyacqjw800kzz5x8xr0sdmi8fgx5xfa5sii1ds";
|
||||
|
||||
self = {
|
||||
llvm = callPackage ./llvm.nix rec {
|
||||
version = "3.4.2";
|
||||
fetch = fetch_v version;
|
||||
inherit compiler-rt_src;
|
||||
};
|
||||
|
||||
clang = callPackage ./clang.nix rec {
|
||||
version = "3.4.2";
|
||||
fetch = fetch_v version;
|
||||
inherit clang-tools-extra_src;
|
||||
};
|
||||
|
||||
lld = callPackage ./lld.nix {};
|
||||
|
||||
lldb = callPackage ./lldb.nix {};
|
||||
|
||||
polly = callPackage ./polly.nix {};
|
||||
|
||||
dragonegg = callPackage ./dragonegg.nix {};
|
||||
};
|
||||
in self
|
||||
@ -1,35 +0,0 @@
|
||||
{stdenv, fetch, fetchpatch, llvm, gmp, mpfr, libmpc, ncurses, zlib, version}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dragonegg-${version}";
|
||||
|
||||
src = fetch "dragonegg" "1733czbvby1ww3xkwcwmm0km0bpwhfyxvf56wb0zv5gksp3kbgrl";
|
||||
|
||||
patches = [(fetchpatch {
|
||||
url = "https://llvm.org/viewvc/llvm-project/dragonegg/trunk/src/x86/ABIHack.inc"
|
||||
+ "?r1=208730&r2=208729&view=patch";
|
||||
sha256 = "1al82gqz90hzjx24p0wls029lw2bgnlgd209kgvxsp82p4z1v1c1";
|
||||
name = "bug-18548.patch";
|
||||
})];
|
||||
patchFlags = "-p2";
|
||||
|
||||
# The gcc the plugin will be built for (the same used building dragonegg)
|
||||
GCC = "gcc";
|
||||
|
||||
buildInputs = [ llvm gmp mpfr libmpc ncurses zlib ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib $out/share/doc/${name}
|
||||
cp -d dragonegg.so $out/lib
|
||||
cp README COPYING $out/share/doc/${name}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://dragonegg.llvm.org/;
|
||||
description = "gcc plugin that replaces gcc's optimizers and code generators by those in LLVM";
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
@ -1,29 +0,0 @@
|
||||
{ stdenv, fetch, cmake, llvm, ncurses, zlib, python2, version }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "lld-${version}";
|
||||
|
||||
src = fetch "lld" "1sd4scqynryfrmcc4h0ljgwn2dgjmbbmf38z50ya6l0janpd2nxz";
|
||||
|
||||
preUnpack = ''
|
||||
# !!! Hopefully won't be needed for 3.5
|
||||
unpackFile ${llvm.src}
|
||||
export cmakeFlags="$cmakeFlags -DLLD_PATH_TO_LLVM_SOURCE="`ls -d $PWD/llvm-*`
|
||||
'';
|
||||
|
||||
buildInputs = [ cmake ncurses zlib python2 ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_CXX_FLAGS=-std=c++11"
|
||||
"-DLLD_PATH_TO_LLVM_BUILD=${llvm}"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "A set of modular code for creating linker tools";
|
||||
homepage = http://llvm.org/;
|
||||
license = stdenv.lib.licenses.ncsa;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@ -1,43 +0,0 @@
|
||||
{ stdenv
|
||||
, fetch
|
||||
, cmake
|
||||
, zlib
|
||||
, ncurses
|
||||
, swig
|
||||
, which
|
||||
, libedit
|
||||
, llvm
|
||||
, clang
|
||||
, python2
|
||||
, version
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "lldb-${version}";
|
||||
|
||||
src = fetch "lldb" "0h8cmjrhjhigk7k2qll1pcf6jfgmbdzkzfz2i048pkfg851s0x4g";
|
||||
|
||||
patchPhase = ''
|
||||
sed -i 's|/usr/bin/env||' \
|
||||
scripts/Python/finish-swig-Python-LLDB.sh \
|
||||
scripts/Python/build-swig-Python.sh
|
||||
'';
|
||||
|
||||
buildInputs = [ cmake python2 which swig ncurses zlib libedit ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_CXX_FLAGS=-std=c++11"
|
||||
"-DLLDB_PATH_TO_LLVM_BUILD=${llvm}"
|
||||
"-DLLDB_PATH_TO_CLANG_BUILD=${clang}"
|
||||
"-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "A next-generation high-performance debugger";
|
||||
homepage = http://llvm.org/;
|
||||
license = stdenv.lib.licenses.ncsa;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
diff -Naur llvm-3.4-orig/cmake/modules/TableGen.cmake llvm-3.4/cmake/modules/TableGen.cmake
|
||||
--- llvm-3.4-orig/cmake/modules/TableGen.cmake 2013-10-06 21:00:07.000000000 -0400
|
||||
+++ llvm-3.4/cmake/modules/TableGen.cmake 2014-01-20 13:06:55.273022149 -0500
|
||||
@@ -78,8 +78,6 @@
|
||||
endif()
|
||||
|
||||
macro(add_tablegen target project)
|
||||
- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LLVM_TOOLS_BINARY_DIR})
|
||||
-
|
||||
set(${target}_OLD_LLVM_LINK_COMPONENTS ${LLVM_LINK_COMPONENTS})
|
||||
set(LLVM_LINK_COMPONENTS ${LLVM_LINK_COMPONENTS} TableGen)
|
||||
add_llvm_utility(${target} ${ARGN})
|
||||
@ -1,94 +0,0 @@
|
||||
{ stdenv
|
||||
, fetch
|
||||
, fetchpatch
|
||||
, perl
|
||||
, groff
|
||||
, cmake
|
||||
, python2
|
||||
, libffi
|
||||
, libbfd
|
||||
, libxml2
|
||||
, ncurses
|
||||
, version
|
||||
, zlib
|
||||
, compiler-rt_src
|
||||
, debugVersion ? false
|
||||
}:
|
||||
|
||||
let
|
||||
src = fetch "llvm" "1mzgy7r0dma0npi1qrbr1s5n4nbj1ipxgbiw0q671l4s0r3qs0qp";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "llvm-${version}";
|
||||
|
||||
unpackPhase = ''
|
||||
unpackFile ${src}
|
||||
mv llvm-${version}.src llvm
|
||||
sourceRoot=$PWD/llvm
|
||||
unpackFile ${compiler-rt_src}
|
||||
mv compiler-rt-* $sourceRoot/projects/compiler-rt
|
||||
'';
|
||||
|
||||
buildInputs =
|
||||
[ perl groff cmake libxml2 libffi python2 ] /*
|
||||
++ stdenv.lib.optional stdenv.isLinux valgrind */;
|
||||
|
||||
propagatedBuildInputs = [ ncurses zlib ];
|
||||
|
||||
patches = stdenv.lib.optionals (!stdenv.isDarwin) [
|
||||
# llvm-config --libfiles returns (non-existing) static libs
|
||||
../fix-llvm-config.patch
|
||||
];
|
||||
|
||||
postPatch = stdenv.lib.optionalString (stdenv ? glibc) ''
|
||||
(
|
||||
cd projects/compiler-rt
|
||||
patch -p1 -F3 < ${
|
||||
fetchpatch {
|
||||
name = "sigaltstack.patch"; # for glibc-2.26
|
||||
url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff;
|
||||
sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi";
|
||||
}
|
||||
}
|
||||
|
||||
sed -i "s,#include <pthread.h>,&\n#include <signal.h>,g" \
|
||||
lib/asan/asan_linux.cc
|
||||
)
|
||||
'';
|
||||
|
||||
# hacky fix: created binaries need to be run before installation
|
||||
preBuild = ''
|
||||
mkdir -p $out/
|
||||
ln -sv $PWD/lib $out
|
||||
'';
|
||||
|
||||
cmakeFlags = with stdenv; [
|
||||
"-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}"
|
||||
"-DLLVM_BUILD_TESTS=ON"
|
||||
"-DLLVM_ENABLE_FFI=ON"
|
||||
"-DLLVM_REQUIRES_RTTI=1"
|
||||
"-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"
|
||||
"-DCMAKE_CXX_FLAGS=-std=c++11"
|
||||
] ++ stdenv.lib.optional (!stdenv.isDarwin) "-DBUILD_SHARED_LIBS=ON";
|
||||
|
||||
postBuild = ''
|
||||
rm -fR $out
|
||||
|
||||
paxmark m bin/{lli,llvm-rtdyld}
|
||||
|
||||
paxmark m unittests/ExecutionEngine/JIT/JITTests
|
||||
paxmark m unittests/ExecutionEngine/MCJIT/MCJITTests
|
||||
paxmark m unittests/Support/SupportTests
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.src = src;
|
||||
|
||||
meta = {
|
||||
description = "Collection of modular and reusable compiler and toolchain technologies";
|
||||
homepage = http://llvm.org/;
|
||||
license = stdenv.lib.licenses.ncsa;
|
||||
maintainers = with stdenv.lib.maintainers; [ lovek323 raskin ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "armv7l-linux"];
|
||||
};
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
diff -Naur polly-3.4-orig/CMakeLists.txt polly-3.4/CMakeLists.txt
|
||||
--- polly-3.4-orig/CMakeLists.txt 2013-11-21 06:51:46.000000000 -0500
|
||||
+++ polly-3.4/CMakeLists.txt 2014-01-20 18:49:34.907919933 -0500
|
||||
@@ -53,7 +53,7 @@
|
||||
execute_process(COMMAND "${LLVM_INSTALL_ROOT}/bin/llvm-config" --cxxflags
|
||||
OUTPUT_VARIABLE LLVM_CXX_FLAGS
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
- set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${LLVM_CXX_FLAGS})
|
||||
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LLVM_CXX_FLAGS}")
|
||||
endif(NOT DEFINED LLVM_MAIN_SRC_DIR)
|
||||
|
||||
set(POLLY_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
@ -1,25 +0,0 @@
|
||||
{ stdenv, fetch, cmake, isl, python2, gmp, llvm, version }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "polly-${version}";
|
||||
|
||||
src = fetch "polly" "1rqflmgzg1vzjm0r32c5ck8x3q0qm3g0hh8ggbjazh6x7nvmy6lz";
|
||||
|
||||
patches = [ ./polly-separate-build.patch ];
|
||||
|
||||
buildInputs = [ cmake isl python2 gmp ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_CXX_FLAGS=-std=c++11"
|
||||
"-DLLVM_INSTALL_ROOT=${llvm}"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "A polyhedral optimizer for llvm";
|
||||
homepage = http://llvm.org/;
|
||||
license = stdenv.lib.licenses.ncsa;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@ -80,11 +80,13 @@ stdenv.mkDerivation rec {
|
||||
|
||||
inherit enableParallelBuilding;
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://mono-project.com/;
|
||||
description = "Cross platform, open source .NET development framework";
|
||||
platforms = with stdenv.lib.platforms; darwin ++ linux;
|
||||
maintainers = with stdenv.lib.maintainers; [ thoughtpolice obadz vrthra ];
|
||||
license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ?
|
||||
platforms = with platforms; darwin ++ linux;
|
||||
maintainers = with maintainers; [ thoughtpolice obadz vrthra ];
|
||||
license = licenses.free; # Combination of LGPL/X11/GPL ?
|
||||
# 2018-08-21: mono 5.x is broken on aarch64 since at least 2017-07-06
|
||||
broken = stdenv.isAarch64 && (versionAtLeast version "5");
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bats-${version}";
|
||||
version = "0.4.0";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/sstephenson/bats/archive/v${version}.tar.gz";
|
||||
sha256 = "05xpvfm0xky1532i3hd2l3wznxzh99bv2hxgykwdpxh18h6jr6jm";
|
||||
url = "https://github.com/bats-core/bats-core/archive/v${version}.tar.gz";
|
||||
sha256 = "1kkh0j2alql3xiyhw9wsvcc3xclv52g0ivgyk8h85q9fn3qdqakz";
|
||||
};
|
||||
|
||||
patchPhase = "patchShebangs ./install.sh";
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
installPhase = "./install.sh $out";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/sstephenson/bats;
|
||||
homepage = https://github.com/bats-core/bats-core;
|
||||
description = "Bash Automated Testing System";
|
||||
maintainers = [ maintainers.lnl7 ];
|
||||
license = licenses.mit;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ mkDerivation }:
|
||||
|
||||
mkDerivation rec {
|
||||
version = "1.6.5";
|
||||
sha256 = "0il1fraz6c8qbqv4wrp16jqrkf3xglfa9f3sdm6q4vv8kjf3lxxb";
|
||||
minimumOTPVersion = "18";
|
||||
version = "1.6.6";
|
||||
sha256 = "1wl8rfpw0dxacq4f7xf6wjr8v2ww5691d0cfw9pzw7phd19vazgl";
|
||||
minimumOTPVersion = "19";
|
||||
}
|
||||
|
||||
@ -3,5 +3,5 @@
|
||||
mkDerivation rec {
|
||||
version = "1.7.2";
|
||||
sha256 = "0wnrx6wlpmr23ypm8za0c4dl952nj4rjylcsdzz0xrma92ylrqfq";
|
||||
minimumOTPVersion = "18";
|
||||
minimumOTPVersion = "19";
|
||||
}
|
||||
|
||||
@ -57,6 +57,8 @@ in stdenv.mkDerivation ({
|
||||
|
||||
debugInfo = enableDebugInfo;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense
|
||||
prePatch = ''
|
||||
substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL'
|
||||
|
||||
@ -26,5 +26,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "http://www.libsdl.org/projects/SDL_image/";
|
||||
maintainers = with maintainers; [ lovek323 ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.zlib;
|
||||
};
|
||||
}
|
||||
|
||||
@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = http://www.libsdl.org/projects/SDL_mixer/;
|
||||
maintainers = with maintainers; [ lovek323 ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.zlib;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
{stdenv, fetchurl, xlibsWrapper, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex, pkgconfig}:
|
||||
{ stdenv, fetchurl
|
||||
, imake, gccmakedep, bison, flex, pkgconfig
|
||||
, xlibsWrapper, libXmu, libXpm, libXp }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "Xaw3d-1.6.3";
|
||||
@ -6,12 +8,13 @@ stdenv.mkDerivation {
|
||||
url = https://www.x.org/releases/individual/lib/libXaw3d-1.6.3.tar.bz2;
|
||||
sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid";
|
||||
};
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [imake gccmakedep libXpm libXp bison flex];
|
||||
propagatedBuildInputs = [xlibsWrapper libXmu];
|
||||
nativeBuildInputs = [ pkgconfig bison flex imake gccmakedep ];
|
||||
buildInputs = [ libXpm libXp ];
|
||||
propagatedBuildInputs = [ xlibsWrapper libXmu ];
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "3D widget set based on the Athena Widget set";
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
||||
@ -38,9 +38,10 @@ stdenv.mkDerivation {
|
||||
install -Dm444 ProcessingDeviceKeysSimple.txt $out/share/${baseName}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://forum.doom9.org/showthread.php?t=123311;
|
||||
description = "A library and program to retrieve decryption keys for HD discs";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
platforms = platforms.linux;
|
||||
license = licenses.publicDomain;
|
||||
};
|
||||
}
|
||||
|
||||
@ -15,13 +15,13 @@ let
|
||||
else throw "Unsupported system!";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "aws-sdk-cpp-${version}";
|
||||
version = "1.4.82";
|
||||
version = "1.5.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "aws-sdk-cpp";
|
||||
rev = version;
|
||||
sha256 = "1m5xylcwx5vhz0q3srlq9rbr4x9kydd77mf45agd60clq25sxs69";
|
||||
sha256 = "0mmzf3js6090kk9vdwrmib5cjny43mqf044iynkhkglzvwhadc8z";
|
||||
};
|
||||
|
||||
# FIXME: might be nice to put different APIs in different outputs
|
||||
|
||||
11
pkgs/development/libraries/boost/1.68.nix
Normal file
11
pkgs/development/libraries/boost/1.68.nix
Normal file
@ -0,0 +1,11 @@
|
||||
{ stdenv, callPackage, fetchurl, fetchpatch, hostPlatform, buildPlatform, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "1.68_0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/boost/boost_1_68_0.tar.bz2";
|
||||
# SHA256 from http://www.boost.org/users/history/version_1_68_0.html
|
||||
sha256 = "7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7";
|
||||
};
|
||||
})
|
||||
@ -1,5 +1,7 @@
|
||||
{ stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintl
|
||||
, icu, graphite2, harfbuzz # The icu variant uses and propagates the non-icu one.
|
||||
, ApplicationServices, CoreText
|
||||
, withCoreText ? false
|
||||
, withIcu ? false # recommended by upstream as default, but most don't needed and it's big
|
||||
, withGraphite2 ? true # it is small and major distros do include it
|
||||
, python
|
||||
@ -27,12 +29,17 @@ stdenv.mkDerivation {
|
||||
outputBin = "dev";
|
||||
|
||||
configureFlags = [
|
||||
( "--with-graphite2=" + (if withGraphite2 then "yes" else "no") ) # not auto-detected by default
|
||||
( "--with-icu=" + (if withIcu then "yes" else "no") )
|
||||
];
|
||||
# not auto-detected by default
|
||||
"--with-graphite2=${if withGraphite2 then "yes" else "no"}"
|
||||
"--with-icu=${if withIcu then "yes" else "no"}"
|
||||
]
|
||||
++ stdenv.lib.optional withCoreText "--with-coretext=yes";
|
||||
|
||||
nativeBuildInputs = [ pkgconfig libintl ];
|
||||
buildInputs = [ glib freetype cairo ]; # recommended by upstream
|
||||
|
||||
buildInputs = [ glib freetype cairo ] # recommended by upstream
|
||||
++ stdenv.lib.optionals withCoreText [ ApplicationServices CoreText ];
|
||||
|
||||
propagatedBuildInputs = []
|
||||
++ optional withGraphite2 graphite2
|
||||
++ optionals withIcu [ icu harfbuzz ];
|
||||
|
||||
@ -1,16 +1,18 @@
|
||||
{ stdenv, fetchurl, automake, autoconf, libtool, which }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ilmbase-2.2.1";
|
||||
name = "ilmbase-${version}";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz";
|
||||
sha256 = "17k0hq19wplx9s029kjrq6c51x2ryrfmaavcappkd0g67gk0dhna";
|
||||
url = "https://github.com/openexr/openexr/releases/download/v${version}/${name}.tar.gz";
|
||||
sha256 = "0qiq5bqq9rxhqjiym2k36sx4vq8adgrz6xf6qwizi9bqm78phsa5";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs ./bootstrap
|
||||
./bootstrap
|
||||
'';
|
||||
|
||||
|
||||
@ -1,15 +1,14 @@
|
||||
{stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, libtool, python2Packages, glib, jansson}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.0.8";
|
||||
version = "3.1.0";
|
||||
name = "libsearpc-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "haiwen";
|
||||
repo = "libsearpc";
|
||||
# Tag is missing: https://github.com/haiwen/libsearpc/commit/12a01268825e9c7e17794c58c367e3b4db912ad9
|
||||
rev = "12a01268825e9c7e17794c58c367e3b4db912ad9";
|
||||
sha256 = "00ck1hl1x0pn22q3ba32dq3ckc4nrsg58irsmrnmalqbsffhcim0";
|
||||
rev = "v${version}";
|
||||
sha256 = "1zf8xxsl95wdx0372kl8s153hd8q3lhwwvwr2k96ia8scbn2ylkp";
|
||||
};
|
||||
|
||||
patches = [ ./libsearpc.pc.patch ];
|
||||
@ -22,13 +21,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
preConfigure = "./autogen.sh";
|
||||
|
||||
buildPhase = "make -j1";
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/haiwen/libsearpc;
|
||||
description = "A simple and easy-to-use C language RPC framework (including both server side & client side) based on GObject System";
|
||||
license = stdenv.lib.licenses.lgpl3;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ ];
|
||||
license = licenses.lgpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nlohmann_json-${version}";
|
||||
version = "3.1.2";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nlohmann";
|
||||
repo = "json";
|
||||
rev = "v${version}";
|
||||
sha256 = "1mpr781fb2dfbyscrr7nil75lkxsazg4wkm749168lcf2ksrrbfi";
|
||||
sha256 = "0585r6ai9x1bhspffn5w5620wxfl1q1gj476brsnaf7wwnr60hwk";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opencolorio-${version}";
|
||||
version = "1.0.9";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/imageworks/OpenColorIO/archive/v1.0.9.zip";
|
||||
sha256 = "14j80dgbb6f09z63aqh2874vhzpga6zksz8jmqnj1zh87x15pqnr";
|
||||
sha256 = "1vi5pcgj7gv8fp6cdnhszwfh7lh38rl2rk4c5yzsvmgcb7xf48bx";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "out" "dev" ];
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "openexr-${lib.getVersion ilmbase}";
|
||||
name = "openexr-${version}";
|
||||
version = lib.getVersion ilmbase;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz";
|
||||
sha256 = "1kdf2gqznsdinbd5vcmqnif442nyhdf9l7ckc51410qm2gv5m6lg";
|
||||
url = "https://github.com/openexr/openexr/releases/download/v${version}/${name}.tar.gz";
|
||||
sha256 = "19jywbs9qjvsbkvlvzayzi81s976k53wg53vw4xj66lcgylb6v7x";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -15,6 +16,7 @@ stdenv.mkDerivation rec {
|
||||
outputs = [ "bin" "dev" "out" "doc" ];
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs ./bootstrap
|
||||
./bootstrap
|
||||
'';
|
||||
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ stdenv, fetchurl, gfortran, perl, libnl, rdma-core, zlib
|
||||
, numactl
|
||||
|
||||
# Enable the Sun Grid Engine bindings
|
||||
, enableSGE ? false
|
||||
@ -24,7 +25,7 @@ in stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
buildInputs = with stdenv; [ gfortran zlib ]
|
||||
++ lib.optional isLinux libnl
|
||||
++ lib.optionals isLinux [ libnl numactl ]
|
||||
++ lib.optional (isLinux || isFreeBSD) rdma-core;
|
||||
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opensubdiv-${version}";
|
||||
version = "3.3.2";
|
||||
version = "3.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PixarAnimationStudios";
|
||||
repo = "OpenSubdiv";
|
||||
rev = "v${lib.replaceChars ["."] ["_"] version}";
|
||||
sha256 = "0j3vh52w1pnld2a2cm6z7iicni1f617qzg0d8xh3p7l0s2dxjibh";
|
||||
sha256 = "1rld4hgl9yrbnk5sd6bhvnm8jdnqq09hq93hrmx0nhccccximi9z";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
|
||||
name = "pcre2-${version}";
|
||||
version = "10.31";
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2";
|
||||
url = "https://ftp.pcre.org/pub/pcre/${name}.tar.bz2";
|
||||
sha256 = "1b389pzw91k1hzydsh4smdsxyppwz4pv74m3nrvy8rda0j3m6zg0";
|
||||
};
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pkcs11-helper-${version}";
|
||||
version = "1.25";
|
||||
version = "1.25.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenSC";
|
||||
repo = "pkcs11-helper";
|
||||
rev = "${name}";
|
||||
sha256 = "1m7vd3f9dphcwnwz4vn2gh7byxzjfc836z0lg440yrilww20yhpy";
|
||||
sha256 = "1nvj6kdbps860kw64m2rz3v2slyn7jkagfdmskrl6966n99iy2ns";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
|
||||
@ -9,13 +9,13 @@ assert stdenv.isDarwin -> darwin != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "qtkeychain-${if withQt5 then "qt5" else "qt4"}-${version}";
|
||||
version = "0.9.0"; # verify after nix-build with `grep -R "set(PACKAGE_VERSION " result/`
|
||||
version = "0.9.1"; # verify after nix-build with `grep -R "set(PACKAGE_VERSION " result/`
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "frankosterfeld";
|
||||
repo = "qtkeychain";
|
||||
rev = "v${version}";
|
||||
sha256 = "1vff0jrycq6c204ch0w7fix5bsv90aw8pl9yiicx9r5ady0i29m7"; # v0.9.0
|
||||
sha256 = "0h4wgngn2yl35hapbjs24amkjfbzsvnna4ixfhn87snjnq5lmjbc"; # v0.9.1
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]
|
||||
|
||||
44
pkgs/development/libraries/science/math/scs/default.nix
Normal file
44
pkgs/development/libraries/science/math/scs/default.nix
Normal file
@ -0,0 +1,44 @@
|
||||
{ stdenv, fetchFromGitHub, blas, liblapack, gfortran }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "scs-${version}";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cvxgrp";
|
||||
repo = "scs";
|
||||
rev = "v${version}";
|
||||
sha256 = "17lbcmcsniqlyzgbzmjipfd0rrk25a8hzh7l5wl2wp1iwsd8c3a9";
|
||||
};
|
||||
|
||||
buildInputs = [ blas liblapack gfortran.cc.lib ];
|
||||
|
||||
# Actually link and add libgfortran to the rpath
|
||||
patchPhase = ''
|
||||
sed -i 's/#-lgfortran/-lgfortran/' scs.mk
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
# Test demo requires passing any int as $1; 42 chosen arbitrarily
|
||||
checkPhase = ''
|
||||
./out/demo_socp_indirect 42
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib
|
||||
cp -r include $out/
|
||||
cp out/*.a out/*.so $out/lib/
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Splitting Conic Solver";
|
||||
longDescription = ''
|
||||
Numerical optimization package for solving large-scale convex cone problems
|
||||
'';
|
||||
homepage = https://github.com/cvxgrp/scs;
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.bhipple ];
|
||||
};
|
||||
}
|
||||
@ -2,5 +2,8 @@
|
||||
"bower"
|
||||
, "coffee-script"
|
||||
, "grunt-cli"
|
||||
, "node-gyp"
|
||||
, "node-gyp-build"
|
||||
, "node-pre-gyp"
|
||||
, "pnpm"
|
||||
]
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, ocaml, findlib, piqi, camlp4 }:
|
||||
{ stdenv, fetchurl, fetchpatch, ocaml, findlib, piqi, camlp4 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.7.5";
|
||||
@ -9,6 +9,11 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0ngz6y8i98i5v2ma8nk6mc83pdsmf2z0ks7m3xi6clfg3zqbddrv";
|
||||
};
|
||||
|
||||
patches = [ (fetchpatch {
|
||||
url = https://github.com/alavrik/piqi-ocaml/commit/336e8fdb84e77f4105e9bbb5ab545b8729101308.patch;
|
||||
sha256 = "071s4xjyr6xx95v6az2lbl2igc87n7z5jqnnbhfq2pidrxakd0la";
|
||||
})];
|
||||
|
||||
buildInputs = [ ocaml findlib piqi camlp4 ];
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user