Merge remote-tracking branch 'upstream/master' into HEAD
This commit is contained in:
Frederik Rietdijk
commit
febd5e323d
12
.github/CODEOWNERS
vendored
12
.github/CODEOWNERS
vendored
@ -7,15 +7,15 @@
|
||||
# For documentation on this file, see https://help.github.com/articles/about-codeowners/
|
||||
# Mentioned users will get code review requests.
|
||||
|
||||
# This file
|
||||
.github/CODEOWNERS @edolstra
|
||||
|
||||
# Boostraping and core infra
|
||||
pkgs/stdenv/ @Ericson2314
|
||||
pkgs/build-support/cc-wrapper/ @Ericson2314
|
||||
pkgs/stdenv/ @edolstra
|
||||
pkgs/build-support/cc-wrapper/ @edolstra
|
||||
|
||||
# Libraries
|
||||
lib/ @Profpatsch
|
||||
|
||||
# Build-Support
|
||||
pkgs/build-support @Profpatsch
|
||||
lib/ @edolstra
|
||||
|
||||
# Python-related code and docs
|
||||
pkgs/top-level/python-packages.nix @FRidh
|
||||
|
||||
@ -254,7 +254,6 @@
|
||||
hydra-queue-runner = 235;
|
||||
hydra-www = 236;
|
||||
syncthing = 237;
|
||||
mfi = 238;
|
||||
caddy = 239;
|
||||
taskd = 240;
|
||||
factorio = 241;
|
||||
@ -522,7 +521,6 @@
|
||||
octoprint = 230;
|
||||
radicale = 234;
|
||||
syncthing = 237;
|
||||
#mfi = 238; # unused
|
||||
caddy = 239;
|
||||
taskd = 240;
|
||||
factorio = 241;
|
||||
|
||||
@ -458,7 +458,6 @@
|
||||
./services/networking/lldpd.nix
|
||||
./services/networking/logmein-hamachi.nix
|
||||
./services/networking/mailpile.nix
|
||||
./services/networking/mfi.nix
|
||||
./services/networking/mjpg-streamer.nix
|
||||
./services/networking/minidlna.nix
|
||||
./services/networking/miniupnpd.nix
|
||||
|
||||
@ -836,11 +836,5 @@ in
|
||||
(mkIf (cfg.dnsBlacklists != []) {
|
||||
services.postfix.mapFiles."client_access" = checkClientAccessFile;
|
||||
})
|
||||
(mkIf (cfg.extraConfig != "") {
|
||||
warnings = [ "The services.postfix.extraConfig option was deprecated. Please use services.postfix.config instead." ];
|
||||
})
|
||||
(mkIf (cfg.extraMasterConf != "") {
|
||||
warnings = [ "The services.postfix.extraMasterConf option was deprecated. Please use services.postfix.masterConfig instead." ];
|
||||
})
|
||||
]);
|
||||
}
|
||||
|
||||
@ -1,100 +0,0 @@
|
||||
{ config, lib, pkgs, utils, ... }:
|
||||
with lib;
|
||||
let
|
||||
name = "Ubiquiti mFi Controller";
|
||||
cfg = config.services.mfi;
|
||||
stateDir = "/var/lib/mfi";
|
||||
# XXX 2 runtime exceptions using jre8: JSPException on GET / ; can't initialize ./data/keystore on first run.
|
||||
cmd = "@${pkgs.jre7}/bin/java java -jar ${stateDir}/lib/ace.jar";
|
||||
mountPoints = [
|
||||
{ what = "${pkgs.mfi}/dl"; where = "${stateDir}/dl"; }
|
||||
{ what = "${pkgs.mfi}/lib"; where = "${stateDir}/lib"; }
|
||||
{ what = "${pkgs.mongodb248}/bin"; where = "${stateDir}/bin"; }
|
||||
{ what = "${cfg.dataDir}"; where = "${stateDir}/data"; }
|
||||
];
|
||||
systemdMountPoints = map (m: "${utils.escapeSystemdPath m.where}.mount") mountPoints;
|
||||
ports = [ 6080 6880 6443 6843 ];
|
||||
in
|
||||
{
|
||||
options = {
|
||||
services.mfi = {
|
||||
enable = mkEnableOption name;
|
||||
openPorts = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = "Whether to open TCP ports ${concatMapStrings (a: "${toString a} ") ports}for the services.";
|
||||
};
|
||||
dataDir = mkOption {
|
||||
type = types.str;
|
||||
default = "${stateDir}/data";
|
||||
description = ''
|
||||
Where to store the database and other data.
|
||||
|
||||
This directory will be bind-mounted to ${stateDir}/data as part of the service startup.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
networking.firewall.allowedTCPPorts = mkIf config.services.mfi.openPorts ports;
|
||||
|
||||
users.users.mfi = {
|
||||
uid = config.ids.uids.mfi;
|
||||
description = "mFi controller daemon user";
|
||||
home = "${stateDir}";
|
||||
};
|
||||
|
||||
# We must create the binary directories as bind mounts instead of symlinks
|
||||
# This is because the controller resolves all symlinks to absolute paths
|
||||
# to be used as the working directory.
|
||||
systemd.mounts = map ({ what, where }: {
|
||||
bindsTo = [ "mfi.service" ];
|
||||
partOf = [ "mfi.service" ];
|
||||
unitConfig.RequiresMountsFor = stateDir;
|
||||
options = "bind";
|
||||
what = what;
|
||||
where = where;
|
||||
}) mountPoints;
|
||||
|
||||
systemd.services.mfi = {
|
||||
description = "mFi controller daemon";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ] ++ systemdMountPoints;
|
||||
partOf = systemdMountPoints;
|
||||
bindsTo = systemdMountPoints;
|
||||
unitConfig.RequiresMountsFor = stateDir;
|
||||
|
||||
preStart = ''
|
||||
# Clear ./webapps each run.
|
||||
rm -rf "${stateDir}/webapps"
|
||||
mkdir -p "${stateDir}/webapps"
|
||||
ln -s "${pkgs.mfi}/webapps/ROOT.war" "${stateDir}/webapps"
|
||||
|
||||
# Copy initial config only once.
|
||||
test -e "${stateDir}/conf" || cp -ar "${pkgs.mfi}/conf" "${stateDir}/conf"
|
||||
test -e "${stateDir}/data" || cp -ar "${pkgs.mfi}/data" "${stateDir}/data"
|
||||
|
||||
# Fix Permissions.
|
||||
# (Bind-mounts cause errors; ignore exit codes)
|
||||
chown -fR mfi: "${stateDir}" || true
|
||||
chmod -fR u=rwX,go= "${stateDir}" || true
|
||||
'';
|
||||
|
||||
postStop = ''
|
||||
rm -rf "${stateDir}/webapps"
|
||||
'';
|
||||
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
ExecStart = "${cmd} start";
|
||||
ExecStop = "${cmd} stop";
|
||||
User = "mfi";
|
||||
PermissionsStartOnly = true;
|
||||
UMask = "0077";
|
||||
WorkingDirectory = "${stateDir}";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -81,8 +81,8 @@ in rec {
|
||||
(all nixos.tests.boot.uefiUsb)
|
||||
(all nixos.tests.boot-stage1)
|
||||
nixos.tests.hibernate.x86_64-linux # i686 is flaky, see #23107
|
||||
nixos.tests.docker.x86_64-linux
|
||||
nixos.tests.docker-edge.x86_64-linux
|
||||
nixos.tests.docker
|
||||
nixos.tests.docker-edge
|
||||
(all nixos.tests.ecryptfs)
|
||||
(all nixos.tests.env)
|
||||
(all nixos.tests.ipv6)
|
||||
|
||||
@ -263,10 +263,10 @@ in rec {
|
||||
tests.plasma5 = callTest tests/plasma5.nix {};
|
||||
tests.keymap = callSubTests tests/keymap.nix {};
|
||||
tests.initrdNetwork = callTest tests/initrd-network.nix {};
|
||||
tests.kernel-copperhead = tests/kernel-copperhead.nix {};
|
||||
tests.kernel-latest = tests/kernel-latest.nix {};
|
||||
tests.kernel-lts = tests/kernel-lts.nix {};
|
||||
tests.kernel-params = tests/kernel-params.nix {};
|
||||
tests.kernel-copperhead = callTest tests/kernel-copperhead.nix {};
|
||||
tests.kernel-latest = callTest tests/kernel-latest.nix {};
|
||||
tests.kernel-lts = callTest tests/kernel-lts.nix {};
|
||||
tests.kernel-params = callTest tests/kernel-params.nix {};
|
||||
tests.keystone = callTest tests/keystone.nix {};
|
||||
tests.kubernetes = hydraJob (import tests/kubernetes.nix { system = "x86_64-linux"; });
|
||||
tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; };
|
||||
|
||||
@ -1,24 +1,26 @@
|
||||
{ stdenv, fetchurl, qt4, pkgconfig, ladspaPlugins, ladspaH,
|
||||
{ stdenv, fetchurl, cmake, qt4, pkgconfig, ladspaPlugins, ladspaH,
|
||||
dssi, liblo, liblrdf, fftwSinglePrec, libsndfile,
|
||||
libsamplerate, perl, makedepend, libjack2,
|
||||
withLirc ? false, lirc ? null } :
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
version = "15.08";
|
||||
version = "17.04";
|
||||
name = "rosegarden-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/rosegarden/${name}.tar.bz2";
|
||||
sha256 = "1pk24bhpsmvn6rkqgll31na44w03banra1y7kiqd0gajlnw7wlls";
|
||||
sha256 = "1khfcj22asdhjh0jvhkqsz200wgmigkhsrcz09ffia5hqm0n32lq";
|
||||
};
|
||||
|
||||
QTDIR=qt4;
|
||||
|
||||
buildInputs = [ qt4 pkgconfig ladspaPlugins ladspaH dssi liblo liblrdf fftwSinglePrec
|
||||
libsndfile libsamplerate perl makedepend libjack2 ]
|
||||
++ stdenv.lib.optional withLirc [ lirc ];
|
||||
|
||||
#enableParallelBuilding = true; issues on hydra
|
||||
|
||||
QTDIR = qt4;
|
||||
|
||||
buildInputs = [
|
||||
cmake qt4 pkgconfig ladspaPlugins ladspaH dssi liblo liblrdf fftwSinglePrec
|
||||
libsndfile libsamplerate perl makedepend libjack2
|
||||
] ++ stdenv.lib.optional withLirc [ lirc ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.rosegardenmusic.com/;
|
||||
description = "Music composition and editing environment";
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "atom-${version}";
|
||||
version = "1.19.4";
|
||||
version = "1.19.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
|
||||
sha256 = "13k98ghz943yd5lqsbsvp1qy79lhgi3vww97qhqcbmmh15n0gsb0";
|
||||
sha256 = "0ividd7bmx0fqz1ykcx5cbnd6qyms1h7r662pcclyzzm3vxj9zif";
|
||||
name = "${name}.deb";
|
||||
};
|
||||
|
||||
|
||||
@ -11,13 +11,10 @@ python27Packages.buildPythonApplication rec {
|
||||
|
||||
propagatedBuildInputs = with python27Packages; [ pygtk pillow ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e '/test_suite/d' setup.py
|
||||
'';
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Image viewer designed to handle comic books";
|
||||
|
||||
longDescription = ''
|
||||
MComix is an user-friendly, customizable image viewer. It is specifically
|
||||
designed to handle comic books, but also serves as a generic viewer.
|
||||
@ -28,9 +25,10 @@ python27Packages.buildPythonApplication rec {
|
||||
MComix is a fork of the Comix project, and aims to add bug fixes and
|
||||
stability improvements after Comix development came to a halt in late 2009.
|
||||
'';
|
||||
|
||||
homepage = http://mcomix.sourceforge.net/;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
|
||||
maintainers = with stdenv.lib.maintainers; [ fuuzetsu AndersonTorres ];
|
||||
};
|
||||
}
|
||||
# TODO:
|
||||
# - error in check phase
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "yEd-${version}";
|
||||
version = "3.17";
|
||||
version = "3.17.1";
|
||||
|
||||
src = requireFile {
|
||||
name = "${name}.zip";
|
||||
url = "https://www.yworks.com/en/products/yfiles/yed/";
|
||||
sha256 = "1wk58cql90y3i5l7jlxqfjjgf26i0zrv5cn0p9npgagaw6aiw2za";
|
||||
sha256 = "0fk1gai7yghfmfvx1rfzdnpwihbq6hqzncyk6zkpqdrf6zz576nl";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip makeWrapper ];
|
||||
|
||||
@ -12,6 +12,10 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1z8h11k29b7z49z5k8ikyfiijyycy1q3krlzi8hfd0vdybvymw21";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./gcc6.patch
|
||||
];
|
||||
|
||||
buildInputs = with perlPackages; [ perl makeWrapper which
|
||||
EncodeLocale MathClipper ExtUtilsXSpp threads
|
||||
MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo
|
||||
@ -31,6 +35,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildPhase = ''
|
||||
export SLIC3R_NO_AUTO=true
|
||||
export LD=$CXX
|
||||
export PERL5LIB="./xs/blib/arch/:./xs/blib/lib:$PERL5LIB"
|
||||
|
||||
substituteInPlace Build.PL \
|
||||
|
||||
40
pkgs/applications/misc/slic3r/gcc6.patch
Normal file
40
pkgs/applications/misc/slic3r/gcc6.patch
Normal file
@ -0,0 +1,40 @@
|
||||
diff --git i/xs/src/libslic3r/Config.hpp w/xs/src/libslic3r/Config.hpp
|
||||
index 49e999b..d9b65d8 100644
|
||||
--- i/xs/src/libslic3r/Config.hpp
|
||||
+++ w/xs/src/libslic3r/Config.hpp
|
||||
@@ -65,7 +65,7 @@ class ConfigOptionFloat : public ConfigOption
|
||||
|
||||
bool deserialize(std::string str) {
|
||||
std::istringstream iss(str);
|
||||
- return iss >> this->value;
|
||||
+ return bool(iss >> this->value);
|
||||
};
|
||||
};
|
||||
|
||||
@@ -124,7 +124,7 @@ class ConfigOptionInt : public ConfigOption
|
||||
|
||||
bool deserialize(std::string str) {
|
||||
std::istringstream iss(str);
|
||||
- return iss >> this->value;
|
||||
+ return bool(iss >> this->value);
|
||||
};
|
||||
};
|
||||
|
||||
@@ -249,7 +249,7 @@ class ConfigOptionPercent : public ConfigOption
|
||||
bool deserialize(std::string str) {
|
||||
// don't try to parse the trailing % since it's optional
|
||||
std::istringstream iss(str);
|
||||
- return iss >> this->value;
|
||||
+ return bool(iss >> this->value);
|
||||
};
|
||||
};
|
||||
|
||||
@@ -279,7 +279,7 @@ class ConfigOptionFloatOrPercent : public ConfigOption
|
||||
bool deserialize(std::string str) {
|
||||
this->percent = str.find_first_of("%") != std::string::npos;
|
||||
std::istringstream iss(str);
|
||||
- return iss >> this->value;
|
||||
+ return bool(iss >> this->value);
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
source $stdenv/setup
|
||||
|
||||
tar xvfz $src
|
||||
cd truecrypt-*
|
||||
|
||||
cp $pkcs11h pkcs11.h
|
||||
cp $pkcs11th pkcs11t.h
|
||||
cp $pkcs11fh pkcs11f.h
|
||||
|
||||
make PKCS11_INC="`pwd`"
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp Main/truecrypt $out/bin
|
||||
mkdir -p $out/share/$name
|
||||
cp License.txt $out/share/$name/LICENSE
|
||||
@ -46,7 +46,24 @@ library, use the 'NOGUI' parameter:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "truecrypt-7.1a";
|
||||
builder = ./builder.sh;
|
||||
|
||||
patchPhase = "patch -p0 < ${./gcc6.patch}";
|
||||
|
||||
preBuild = ''
|
||||
cp $pkcs11h pkcs11.h
|
||||
cp $pkcs11th pkcs11t.h
|
||||
cp $pkcs11fh pkcs11f.h
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
''PKCS11_INC="`pwd`"''
|
||||
(if wxGUI then "" else "NOGUI=1")
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
install -D -t $out/bin Main/truecrypt
|
||||
install -D License.txt $out/share/$name/LICENSE
|
||||
'';
|
||||
|
||||
src = fetchurl {
|
||||
url = https://fossies.org/linux/misc/old/TrueCrypt-7.1a-Source.tar.gz;
|
||||
@ -68,14 +85,13 @@ stdenv.mkDerivation {
|
||||
sha256 = "5ae6a4f32ca737e02def3bf314c9842fb89be82bf00b6f4022a97d8d565522b8";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig fuse devicemapper wxGTK nasm ];
|
||||
makeFlags = if wxGUI then "" else "NOGUI=1";
|
||||
buildInputs = [ pkgconfig fuse devicemapper wxGTK nasm ];
|
||||
|
||||
meta = {
|
||||
description = "Free Open-Source filesystem on-the-fly encryption";
|
||||
homepage = http://www.truecrypt.org/;
|
||||
license = "TrueCrypt License Version 2.6";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
maintainers = with stdenv.lib.maintainers; [ viric ryantm ];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
||||
61
pkgs/applications/misc/truecrypt/gcc6.patch
Normal file
61
pkgs/applications/misc/truecrypt/gcc6.patch
Normal file
@ -0,0 +1,61 @@
|
||||
--- Main/Resources.cpp 2016-05-16 16:47:35.846462041 +0200
|
||||
+++ Main/Resources.cpp 2016-05-16 17:12:21.838202520 +0200
|
||||
@@ -45,13 +45,13 @@
|
||||
strBuf.CopyFrom (res);
|
||||
return string (reinterpret_cast <char *> (strBuf.Ptr()));
|
||||
#else
|
||||
- static const char LanguageXml[] =
|
||||
+ static byte LanguageXml[] =
|
||||
{
|
||||
# include "Common/Language.xml.h"
|
||||
, 0
|
||||
};
|
||||
|
||||
- return string (LanguageXml);
|
||||
+ return string ((const char*) LanguageXml);
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -64,13 +64,13 @@
|
||||
strBuf.CopyFrom (res);
|
||||
return string (reinterpret_cast <char *> (strBuf.Ptr()));
|
||||
#else
|
||||
- static const char License[] =
|
||||
+ static byte License[] =
|
||||
{
|
||||
# include "License.txt.h"
|
||||
, 0
|
||||
};
|
||||
|
||||
- return string (License);
|
||||
+ return string ((const char*) License);
|
||||
#endif
|
||||
}
|
||||
|
||||
--- Main/Forms/PreferencesDialog.cpp 2016-05-16 17:14:47.704707908 +0200
|
||||
+++ Main/Forms/PreferencesDialog.cpp 2016-05-16 17:15:56.927964437 +0200
|
||||
@@ -414,11 +414,11 @@
|
||||
libExtension = wxDynamicLibrary::CanonicalizeName (L"x");
|
||||
|
||||
#ifdef TC_MACOSX
|
||||
- extensions.push_back (make_pair (L"dylib", LangString["DLL_FILES"]));
|
||||
+ extensions.push_back (make_pair (L"dylib", static_cast<const wchar_t*>(LangString["DLL_FILES"].wc_str())));
|
||||
#endif
|
||||
if (!libExtension.empty())
|
||||
{
|
||||
- extensions.push_back (make_pair (libExtension.Mid (libExtension.find (L'.') + 1), LangString["DLL_FILES"]));
|
||||
+ extensions.push_back (make_pair (static_cast<const wchar_t*>(libExtension.Mid (libExtension.find (L'.') + 1).wc_str()), static_cast<const wchar_t*>(LangString["DLL_FILES"].wc_str())));
|
||||
extensions.push_back (make_pair (L"*", L""));
|
||||
}
|
||||
|
||||
--- Main/GraphicUserInterface.cpp 2016-05-16 17:16:38.724591342 +0200
|
||||
+++ Main/GraphicUserInterface.cpp 2016-05-16 17:17:09.854562653 +0200
|
||||
@@ -1445,7 +1445,7 @@
|
||||
FilePath GraphicUserInterface::SelectVolumeFile (wxWindow *parent, bool saveMode, const DirectoryPath &directory) const
|
||||
{
|
||||
list < pair <wstring, wstring> > extensions;
|
||||
- extensions.push_back (make_pair (L"tc", LangString["TC_VOLUMES"]));
|
||||
+ extensions.push_back (make_pair (L"tc", static_cast<const wchar_t*>(LangString["TC_VOLUMES"].wc_str())));
|
||||
|
||||
FilePathList selFiles = Gui->SelectFiles (parent, LangString[saveMode ? "OPEN_NEW_VOLUME" : "OPEN_VOL_TITLE"], saveMode, false, extensions, directory);
|
||||
|
||||
@ -1,27 +1,29 @@
|
||||
{stdenv, fetchurl, pkgconfig
|
||||
{stdenv, fetchFromGitHub, pkgconfig
|
||||
, python
|
||||
, intltool
|
||||
, docbook2x, docbook_xml_dtd_412, libxslt
|
||||
, sword, clucene_core, biblesync
|
||||
, gnome_doc_utils
|
||||
, libgsf, gconf
|
||||
, gtkhtml, libgtkhtml, libglade, scrollkeeper
|
||||
, gtkhtml, libglade, scrollkeeper
|
||||
, webkitgtk
|
||||
, dbus_glib, enchant, isocodes, libuuid
|
||||
, dbus_glib, enchant, isocodes, libuuid, icu
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xiphos-${version}";
|
||||
version = "4.0.3-20150806";
|
||||
version = "4.0.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/gnomesword/Xiphos/4.0.3/${name}.tar.gz";
|
||||
sha256 = "1xkvhpasdlda2rp0874znz158z4rjh1hpynwy13d96kjxq4npiqv";
|
||||
src = fetchFromGitHub {
|
||||
owner = "crosswire";
|
||||
repo = "xiphos";
|
||||
rev = "${version}";
|
||||
sha256 = "02xyy6rxxxaqbjbhdp813f0vp1jpfzqscjdbdc0qcd4yvi3baj5f";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig python intltool docbook2x docbook_xml_dtd_412 libxslt
|
||||
sword clucene_core biblesync gnome_doc_utils libgsf gconf gtkhtml libgtkhtml
|
||||
libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid ];
|
||||
sword clucene_core biblesync gnome_doc_utils libgsf gconf gtkhtml
|
||||
libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid icu ];
|
||||
|
||||
prePatch = ''
|
||||
patchShebangs .;
|
||||
@ -33,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
python waf configure --prefix=$out
|
||||
python waf configure --prefix=$out --enable-webkit2
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@ -1,333 +1,486 @@
|
||||
# Generated with ./update-all
|
||||
{
|
||||
alicloud =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-alicloud";
|
||||
version = "0.1.0";
|
||||
sha256 = "199zrpmi1hqy80nrvdhh5pn7vlcvpjcsf0hpwgzb1r9vnydpz7cj";
|
||||
};
|
||||
archive =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-archive";
|
||||
version = "0.1.0";
|
||||
sha256 = "1g7bjak1vgxpnmp4b9cb3mq8gqp1a7738fj0sxzflfk8k35p27ri";
|
||||
};
|
||||
arukas =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-arukas";
|
||||
version = "0.1.0";
|
||||
sha256 = "1msfr0rlzjfds02h35p99d1f541a1fzndjcpgijb41yx74h2v5dl";
|
||||
};
|
||||
atlas =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-atlas";
|
||||
version = "0.1.1";
|
||||
sha256 = "0k73vv14vnjl5qm33w54s5zzi0mmk1kn2zs3qkfq71aqi9ml7d14";
|
||||
};
|
||||
aws =
|
||||
{
|
||||
pname = "terraform-provider-aws";
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-aws";
|
||||
version = "0.1.4";
|
||||
src = {
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-aws";
|
||||
rev = "v0.1.4";
|
||||
sha256 = "0hqyvp1bgyfqq2lkjq5m5qxybagnxl9zrqiqfnlrfigdp0y31iz8";
|
||||
};
|
||||
sha256 = "0hqyvp1bgyfqq2lkjq5m5qxybagnxl9zrqiqfnlrfigdp0y31iz8";
|
||||
};
|
||||
azure =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-azure";
|
||||
version = "0.1.1";
|
||||
sha256 = "11myqq3wnxvpysjycvwg7b14ll8d9vkn06xb3r26kmc42fkl5xv1";
|
||||
};
|
||||
azurerm =
|
||||
{
|
||||
pname = "terraform-provider-azurerm";
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-azurerm";
|
||||
version = "0.1.6";
|
||||
src = {
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-azurerm";
|
||||
rev = "v0.1.6";
|
||||
sha256 = "01hjr42gpkpwpz0chnkw8pf0yid0hqpdnfz65q5h2p8h627hg0c6";
|
||||
};
|
||||
sha256 = "01hjr42gpkpwpz0chnkw8pf0yid0hqpdnfz65q5h2p8h627hg0c6";
|
||||
};
|
||||
bitbucket =
|
||||
{
|
||||
pname = "terraform-provider-bitbucket";
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-bitbucket";
|
||||
version = "0.1.0";
|
||||
src = {
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-bitbucket";
|
||||
rev = "v0.1.0";
|
||||
sha256 = "0c5aiq0p425h7c600wg5h3601l40airwz6cs724lc72fycbb4s43";
|
||||
};
|
||||
sha256 = "0c5aiq0p425h7c600wg5h3601l40airwz6cs724lc72fycbb4s43";
|
||||
};
|
||||
chef =
|
||||
{
|
||||
pname = "terraform-provider-chef";
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-chef";
|
||||
version = "0.1.0";
|
||||
src = {
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-chef";
|
||||
rev = "v0.1.0";
|
||||
sha256 = "17fppyhxi0rd5v8khw2psdn2hdv5j79hxhinwkzrq5s4iccqk5dw";
|
||||
};
|
||||
sha256 = "17fppyhxi0rd5v8khw2psdn2hdv5j79hxhinwkzrq5s4iccqk5dw";
|
||||
};
|
||||
circonus =
|
||||
{
|
||||
pname = "terraform-provider-circonus";
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-circonus";
|
||||
version = "0.1.0";
|
||||
src = {
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-circonus";
|
||||
rev = "v0.1.0";
|
||||
sha256 = "0v05g91yg2zh4wczp8mi3hmvwb35z0y9044bwy67nm1l624xlj64";
|
||||
};
|
||||
sha256 = "0v05g91yg2zh4wczp8mi3hmvwb35z0y9044bwy67nm1l624xlj64";
|
||||
};
|
||||
clc =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-clc";
|
||||
version = "0.1.0";
|
||||
sha256 = "0gvsjnwk6xkgxai1gxsjf0hsjxbv8d8jg5hq8yd3hjhc6785fgnf";
|
||||
};
|
||||
cloudflare =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-cloudflare";
|
||||
version = "0.1.0";
|
||||
sha256 = "073j0kqkccj7yrqz6j4vx722vmy6mmvmgidamkjnhhjcwm6g1jbq";
|
||||
};
|
||||
cloudstack =
|
||||
{
|
||||
pname = "terraform-provider-cloudstack";
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-cloudstack";
|
||||
version = "0.1.1";
|
||||
src = {
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-cloudstack";
|
||||
rev = "v0.1.1";
|
||||
sha256 = "09iqxpc5a6938qj1js2y9s4dcgk7hw69xga56ixpbbknms2yrhnb";
|
||||
};
|
||||
sha256 = "09iqxpc5a6938qj1js2y9s4dcgk7hw69xga56ixpbbknms2yrhnb";
|
||||
};
|
||||
cobbler =
|
||||
{
|
||||
pname = "terraform-provider-cobbler";
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-cobbler";
|
||||
version = "0.1.0";
|
||||
src = {
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-cobbler";
|
||||
rev = "v0.1.0";
|
||||
sha256 = "1867aqlz1v7scybaia9yakaxw76lh6y2whhajv5pqy1ng58rcgiz";
|
||||
};
|
||||
sha256 = "1867aqlz1v7scybaia9yakaxw76lh6y2whhajv5pqy1ng58rcgiz";
|
||||
};
|
||||
consul =
|
||||
{
|
||||
pname = "terraform-provider-consul";
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-consul";
|
||||
version = "0.1.0";
|
||||
src = {
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-consul";
|
||||
rev = "v0.1.0";
|
||||
sha256 = "1d179m42iv2dy6wjzldllffwg6qxbg6gnvxrp6nzy75v7qp2aq94";
|
||||
};
|
||||
sha256 = "1d179m42iv2dy6wjzldllffwg6qxbg6gnvxrp6nzy75v7qp2aq94";
|
||||
};
|
||||
datadog =
|
||||
{
|
||||
pname = "terraform-provider-datadog";
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-datadog";
|
||||
version = "0.1.0";
|
||||
src = {
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-datadog";
|
||||
rev = "v0.1.0";
|
||||
sha256 = "1k3p0zxffhabs1xb6aw9189vbmh3ax10q4xi1qgjfjvla22byqmk";
|
||||
};
|
||||
sha256 = "1k3p0zxffhabs1xb6aw9189vbmh3ax10q4xi1qgjfjvla22byqmk";
|
||||
};
|
||||
digitalocean =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-digitalocean";
|
||||
version = "0.1.2";
|
||||
sha256 = "0wn2bx9zk0fqvrn7a76rffin7f1b70p66h5bs9073szhr3zph7hg";
|
||||
};
|
||||
dme =
|
||||
{
|
||||
pname = "terraform-provider-dme";
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-dme";
|
||||
version = "0.1.0";
|
||||
src = {
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-dme";
|
||||
rev = "v0.1.0";
|
||||
sha256 = "1ipqw1sbx0i9rhxawsysrqxvf10z8ra2y86xwd4iz0f12x9drblv";
|
||||
};
|
||||
sha256 = "1ipqw1sbx0i9rhxawsysrqxvf10z8ra2y86xwd4iz0f12x9drblv";
|
||||
};
|
||||
dns =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-dns";
|
||||
version = "0.1.1";
|
||||
sha256 = "0ccp02rbvfvrb808mg053q5y7ghvxsl7p1gzw7pkm934i6j90g9n";
|
||||
};
|
||||
dnsimple =
|
||||
{
|
||||
pname = "terraform-provider-dnsimple";
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-dnsimple";
|
||||
version = "0.1.0";
|
||||
src = {
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-dnsimple";
|
||||
rev = "v0.1.0";
|
||||
sha256 = "0gkd5i69ldm5zn34p3k68aqk798g6g0d60gw7yp316l7mskvrx7h";
|
||||
};
|
||||
sha256 = "0gkd5i69ldm5zn34p3k68aqk798g6g0d60gw7yp316l7mskvrx7h";
|
||||
};
|
||||
docker =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-docker";
|
||||
version = "0.1.0";
|
||||
sha256 = "1nacxkyy12w4rj1bdf5ayqmmm47nwh362pcksr227rkwmsjlmg1m";
|
||||
};
|
||||
dyn =
|
||||
{
|
||||
pname = "terraform-provider-dyn";
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-dyn";
|
||||
version = "0.1.0";
|
||||
src = {
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-dyn";
|
||||
rev = "v0.1.0";
|
||||
sha256 = "1w727r2gz5hjmbzw9zir0n5nrr818adh4qj50n3vijqwbxciyq2p";
|
||||
};
|
||||
sha256 = "1w727r2gz5hjmbzw9zir0n5nrr818adh4qj50n3vijqwbxciyq2p";
|
||||
};
|
||||
external =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-external";
|
||||
version = "0.1.0";
|
||||
sha256 = "160f0avv6wbh11z54wy0qcq0zrcj4s31kn7a9x6zikv7v4hfnbza";
|
||||
};
|
||||
fastly =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-fastly";
|
||||
version = "0.1.2";
|
||||
sha256 = "1z7nsgqqzvily9rxr79yjv6jfx56896c9lxb8flmzwjz6b6mvnz7";
|
||||
};
|
||||
github =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-github";
|
||||
version = "0.1.1";
|
||||
sha256 = "0f6nk9nb8h8247rz7x1w11amp0qdcmy1alr8jgd2chrjv9f8nif0";
|
||||
};
|
||||
gitlab =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-gitlab";
|
||||
version = "0.1.0";
|
||||
sha256 = "1xjhpaq2agdshrl5jbq9ak2nxdy86iay5bw16zww2qc5ah21sdg2";
|
||||
};
|
||||
google =
|
||||
{
|
||||
pname = "terraform-provider-google";
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-google";
|
||||
version = "0.1.3";
|
||||
src = {
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-google";
|
||||
rev = "v0.1.3";
|
||||
sha256 = "1aa1hz0yc4g746m6dl04hc70rcrzx0py8kpdch3kim475bspclnf";
|
||||
};
|
||||
sha256 = "1aa1hz0yc4g746m6dl04hc70rcrzx0py8kpdch3kim475bspclnf";
|
||||
};
|
||||
grafana =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-grafana";
|
||||
version = "0.1.0";
|
||||
sha256 = "1m2anc5cyn2p3yh4zn0y6wvzb0s2fz3sfdqm9psvx53266c2c81q";
|
||||
};
|
||||
heroku =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-heroku";
|
||||
version = "0.1.0";
|
||||
sha256 = "1f72lm95bnkhaf2accypdn7xsxcgkqri5fq5mriya4n34c61z3l6";
|
||||
};
|
||||
http =
|
||||
{
|
||||
pname = "terraform-provider-http";
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-http";
|
||||
version = "0.1.0";
|
||||
src = {
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-http";
|
||||
rev = "v0.1.0";
|
||||
sha256 = "1iy5fsl1j4wswbajnw0k6lagc2sz52idnswj1vmfc66x87ls0mah";
|
||||
};
|
||||
sha256 = "1iy5fsl1j4wswbajnw0k6lagc2sz52idnswj1vmfc66x87ls0mah";
|
||||
};
|
||||
icinga2 =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-icinga2";
|
||||
version = "0.1.1";
|
||||
sha256 = "0z7lxrspm33j7bkkm2n7ac0jgyaz3y3lql3gd30p10nvpilrg07v";
|
||||
};
|
||||
ignition =
|
||||
{
|
||||
pname = "terraform-provider-ignition";
|
||||
version = "0.1.0";
|
||||
src = {
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-ignition";
|
||||
rev = "v0.1.0";
|
||||
sha256 = "03jvngd3fjyqmdzg2847p0k2fjyqykgmdng5vss4rcsn0n3b9d39";
|
||||
};
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-ignition";
|
||||
version = "0.2.0";
|
||||
sha256 = "07qsyjzbz34nh7qrmw97sg0zrqbchky9r3ywrdz96pmpr1yjmwr7";
|
||||
};
|
||||
influxdb =
|
||||
{
|
||||
pname = "terraform-provider-influxdb";
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-influxdb";
|
||||
version = "0.1.0";
|
||||
src = {
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-influxdb";
|
||||
rev = "v0.1.0";
|
||||
sha256 = "0msc6maxsiwmsg8ppdfj1397c66llhaf15nc4hmr2h6dxqkb5wl5";
|
||||
};
|
||||
sha256 = "0msc6maxsiwmsg8ppdfj1397c66llhaf15nc4hmr2h6dxqkb5wl5";
|
||||
};
|
||||
kubernetes =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-kubernetes";
|
||||
version = "1.0.0";
|
||||
sha256 = "1kh7a83f98v6b4v3zj84ddhrg2hya4nmvrw0mjc26q12g4z2d5g6";
|
||||
};
|
||||
librato =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-librato";
|
||||
version = "0.1.0";
|
||||
sha256 = "0bxadwj5s7bvc4vlymn3w6qckf14hz82r7q98w2nh55sqr52d923";
|
||||
};
|
||||
local =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-local";
|
||||
version = "0.1.0";
|
||||
sha256 = "02m0wg0jasnzrayamjsc2hzi0ibj83v4d0hmw2xbrxk7vmk71lgq";
|
||||
};
|
||||
logentries =
|
||||
{
|
||||
pname = "terraform-provider-logentries";
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-logentries";
|
||||
version = "0.1.0";
|
||||
src = {
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-logentries";
|
||||
rev = "v0.1.0";
|
||||
sha256 = "11fkb84gqcq59wk5kqn3h428jrc2gkl659zxmkdldad6jdll9ypa";
|
||||
};
|
||||
sha256 = "11fkb84gqcq59wk5kqn3h428jrc2gkl659zxmkdldad6jdll9ypa";
|
||||
};
|
||||
mailgun =
|
||||
{
|
||||
pname = "terraform-provider-mailgun";
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-mailgun";
|
||||
version = "0.1.0";
|
||||
src = {
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-mailgun";
|
||||
rev = "v0.1.0";
|
||||
sha256 = "1hjhjfxqbr43wa248c6hc91lx5b2gdw4vl92l2i6aqp17rbc0wfj";
|
||||
};
|
||||
sha256 = "1hjhjfxqbr43wa248c6hc91lx5b2gdw4vl92l2i6aqp17rbc0wfj";
|
||||
};
|
||||
mysql =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-mysql";
|
||||
version = "0.1.0";
|
||||
sha256 = "0vjr97xf15va9qypjb9318h1nxr0sd6ydcy7ijnqb8538v3581mv";
|
||||
};
|
||||
newrelic =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-newrelic";
|
||||
version = "0.1.1";
|
||||
sha256 = "1fqgxcspkgm3ncsqbvw79h5n09agba7q80nz0mrq09x0pyk8y051";
|
||||
};
|
||||
nomad =
|
||||
{
|
||||
pname = "terraform-provider-nomad";
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-nomad";
|
||||
version = "0.1.0";
|
||||
src = {
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-nomad";
|
||||
rev = "v0.1.0";
|
||||
sha256 = "03sb31l59hxpp6zmnizxdm21jipz4mrzz9czk6ahhx7c8q0n0na8";
|
||||
};
|
||||
sha256 = "03sb31l59hxpp6zmnizxdm21jipz4mrzz9czk6ahhx7c8q0n0na8";
|
||||
};
|
||||
ns1 =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-ns1";
|
||||
version = "0.1.0";
|
||||
sha256 = "1in9ggrvxfb3maxhgiv997hndkpnqpgx1c1365lfizhp7km5ncvj";
|
||||
};
|
||||
null =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-null";
|
||||
version = "0.1.0";
|
||||
sha256 = "069yhsqi4jc14cay1gk7mwwmrg8xv90kj1k5qy3a2ypfbss4fcjp";
|
||||
};
|
||||
oneandone =
|
||||
{
|
||||
pname = "terraform-provider-oneandone";
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-oneandone";
|
||||
version = "0.1.0";
|
||||
src = {
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-oneandone";
|
||||
rev = "v0.1.0";
|
||||
sha256 = "18bbpcprjib4d4skjdr76xjxi9091h5b3dls68y6bxkk6sh6av1i";
|
||||
};
|
||||
sha256 = "18bbpcprjib4d4skjdr76xjxi9091h5b3dls68y6bxkk6sh6av1i";
|
||||
};
|
||||
opc =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-opc";
|
||||
version = "0.1.2";
|
||||
sha256 = "0c4ywav89lln9417zwflrp3qhcs7qf96rgcvm1msmpgglrhzwp2i";
|
||||
};
|
||||
openstack =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-openstack";
|
||||
version = "0.2.1";
|
||||
sha256 = "1zsswsgv7lzhfd0v8llbm18gsfg6xji0r3f9rnvpjqkffj4088ca";
|
||||
};
|
||||
opsgenie =
|
||||
{
|
||||
pname = "terraform-provider-opsgenie";
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-opsgenie";
|
||||
version = "0.1.0";
|
||||
src = {
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-opsgenie";
|
||||
rev = "v0.1.0";
|
||||
sha256 = "0zs0cl6jl4rijcs6vv5k8k5pyf0zs52dlgqcnb1gzslh8sg5pdkm";
|
||||
};
|
||||
sha256 = "0zs0cl6jl4rijcs6vv5k8k5pyf0zs52dlgqcnb1gzslh8sg5pdkm";
|
||||
};
|
||||
ovh =
|
||||
{
|
||||
pname = "terraform-provider-ovh";
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-ovh";
|
||||
version = "0.1.0";
|
||||
src = {
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-ovh";
|
||||
rev = "v0.1.0";
|
||||
sha256 = "052bnfw146h9nh3cw77clwwxbmw1gvaich2yw39v4b1ca8brm5dr";
|
||||
};
|
||||
sha256 = "052bnfw146h9nh3cw77clwwxbmw1gvaich2yw39v4b1ca8brm5dr";
|
||||
};
|
||||
packet =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-packet";
|
||||
version = "0.1.0";
|
||||
sha256 = "0dk10d4b10pdlhqgm6fqg0cn0ff78ss1x76inj6gfwrnbn2amhp0";
|
||||
};
|
||||
pagerduty =
|
||||
{
|
||||
pname = "terraform-provider-pagerduty";
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-pagerduty";
|
||||
version = "0.1.2";
|
||||
src = {
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-pagerduty";
|
||||
rev = "v0.1.2";
|
||||
sha256 = "1dqzi53bnk4qcjhlimr13352nzb1nsij7354zapz2sgnz21v89mm";
|
||||
};
|
||||
sha256 = "1dqzi53bnk4qcjhlimr13352nzb1nsij7354zapz2sgnz21v89mm";
|
||||
};
|
||||
postgresql =
|
||||
{
|
||||
pname = "terraform-provider-postgresql";
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-postgresql";
|
||||
version = "0.1.0";
|
||||
src = {
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-postgresql";
|
||||
rev = "v0.1.0";
|
||||
sha256 = "0gg48b2zn18ynvhnabvyfvw5wif0m1a852798wahv8fbv5d1vh7j";
|
||||
};
|
||||
sha256 = "0gg48b2zn18ynvhnabvyfvw5wif0m1a852798wahv8fbv5d1vh7j";
|
||||
};
|
||||
powerdns =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-powerdns";
|
||||
version = "0.1.0";
|
||||
sha256 = "1k9xjx2smk6478dsrcnqk1k6r2pddpa9n8aghq5d1a5yhfsq5zzz";
|
||||
};
|
||||
profitbricks =
|
||||
{
|
||||
pname = "terraform-provider-profitbricks";
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-profitbricks";
|
||||
version = "0.1.2";
|
||||
src = {
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-profitbricks";
|
||||
rev = "v0.1.2";
|
||||
sha256 = "105l0rijqmp7kmd7wygnhnj02q7y1rz0r8pj2mjzncb5pr48m3qp";
|
||||
};
|
||||
sha256 = "105l0rijqmp7kmd7wygnhnj02q7y1rz0r8pj2mjzncb5pr48m3qp";
|
||||
};
|
||||
rabbitmq =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-rabbitmq";
|
||||
version = "0.1.0";
|
||||
sha256 = "0vn8456f2al1f6rs1gn157c86qz1fxz8sqphbr9lvdhy1jw1q2vp";
|
||||
};
|
||||
rancher =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-rancher";
|
||||
version = "0.2.0";
|
||||
sha256 = "05aci6cjrs7rv6hqhvcqy1i0nr8azds8flnrc7vba0nyy6v192qg";
|
||||
};
|
||||
random =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-random";
|
||||
version = "0.1.0";
|
||||
sha256 = "1lbv5yiw4qfsqm3gxf37gwadgp7g6ki0n70mj00d8l6v6jd0mdl5";
|
||||
};
|
||||
rundeck =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-rundeck";
|
||||
version = "0.1.0";
|
||||
sha256 = "0rp8cgnp8in52g7zkl2lj42hns0g27m8f7l42lhfnv6n2vv5qxcg";
|
||||
};
|
||||
scaleway =
|
||||
{
|
||||
pname = "terraform-provider-scaleway";
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-scaleway";
|
||||
version = "0.1.1";
|
||||
src = {
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-scaleway";
|
||||
rev = "v0.1.1";
|
||||
sha256 = "145wfcr5zjjk8vgx5xjf1hqh6h8jqxkhxbvv9x1w34i5bv809ch6";
|
||||
};
|
||||
sha256 = "145wfcr5zjjk8vgx5xjf1hqh6h8jqxkhxbvv9x1w34i5bv809ch6";
|
||||
};
|
||||
softlayer =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-softlayer";
|
||||
version = "0.0.1";
|
||||
sha256 = "1xcg5zm2n1pc3l7ng94k589r7ykv6fxsmr5qn9xmmpdf912rdnfq";
|
||||
};
|
||||
spotinst =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-spotinst";
|
||||
version = "0.1.0";
|
||||
sha256 = "04sxdbx6qjxixrv9shnp8fxkss6pylqmphlm1l4q5c83dwk96pka";
|
||||
};
|
||||
statuscake =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-statuscake";
|
||||
version = "0.1.0";
|
||||
sha256 = "084520cak2krwpks2ipqcjfw3k4rrzn6gqqncz8c4i6g01f1m7yg";
|
||||
};
|
||||
template =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-template";
|
||||
version = "0.1.1";
|
||||
sha256 = "1qrslnkvcj18jzxmsbf72gm54s8dnw5k5z15nffwgy09vv7mzpcn";
|
||||
};
|
||||
terraform =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-terraform";
|
||||
version = "0.1.0";
|
||||
sha256 = "1w465853gwffpydb7idvg7bk8ygadgy08s04fxsqc8i2683jbpiz";
|
||||
};
|
||||
tls =
|
||||
{
|
||||
pname = "terraform-provider-tls";
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-tls";
|
||||
version = "0.1.0";
|
||||
src = {
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-tls";
|
||||
rev = "v0.1.0";
|
||||
sha256 = "1n1k4dcqm8lp7mgj88xj8xc09mn769np4wg3cggnpcs6igbgdgg7";
|
||||
};
|
||||
sha256 = "1n1k4dcqm8lp7mgj88xj8xc09mn769np4wg3cggnpcs6igbgdgg7";
|
||||
};
|
||||
triton =
|
||||
{
|
||||
pname = "terraform-provider-triton";
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-triton";
|
||||
version = "0.1.2";
|
||||
src = {
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-triton";
|
||||
rev = "v0.1.2";
|
||||
sha256 = "1jyrmc7932w7d8q96lmd0axf32psfic5d7hmwm1a25vzjzfn9nlw";
|
||||
};
|
||||
sha256 = "1jyrmc7932w7d8q96lmd0axf32psfic5d7hmwm1a25vzjzfn9nlw";
|
||||
};
|
||||
ultradns =
|
||||
{
|
||||
pname = "terraform-provider-ultradns";
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-ultradns";
|
||||
version = "0.1.0";
|
||||
src = {
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-ultradns";
|
||||
rev = "v0.1.0";
|
||||
sha256 = "0bq2y6bxdax7qnmq6vxh8pz9sqy1r3m05dv7q5dbv2xvba1b88hj";
|
||||
};
|
||||
sha256 = "0bq2y6bxdax7qnmq6vxh8pz9sqy1r3m05dv7q5dbv2xvba1b88hj";
|
||||
};
|
||||
vault =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-vault";
|
||||
version = "0.1.0";
|
||||
sha256 = "1rr4gaqfr6panjjdb5xx9vbq7701zjps0l75zi526kij1pph98p1";
|
||||
};
|
||||
vcd =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-vcd";
|
||||
version = "1.0.0";
|
||||
sha256 = "0sjqdb37lalvizf4imxwn7nmry1c76dw2fpnrfmal34gghddm91p";
|
||||
};
|
||||
vsphere =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-vsphere";
|
||||
version = "0.2.2";
|
||||
sha256 = "0d5d4wip57zmv9kqh4zr9mz8ylffa2qcf1vmx827rwyqdr25xvaz";
|
||||
};
|
||||
# Broken with go/src/github.com/terraform-providers/terraform-provider-vsphere/vendor/github.com/hashicorp/terraform/config/testing.go:9: t.Helper undefined (type *testing.T has no field or method Helper)
|
||||
# vsphere =
|
||||
# {
|
||||
# pname = "terraform-provider-vsphere";
|
||||
# version = "0.2.1";
|
||||
# src = {
|
||||
# owner = "terraform-providers";
|
||||
# repo = "terraform-provider-vsphere";
|
||||
# rev = "v0.2.1";
|
||||
# sha256 = "04vz34w28nx7j6wlikgjabrb2l5fxj9icfm8d34w2fffz63nk77l";
|
||||
# };
|
||||
# };
|
||||
}
|
||||
|
||||
@ -1,12 +1,21 @@
|
||||
{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
|
||||
let
|
||||
list = import ./data.nix;
|
||||
toDrv = _: data:
|
||||
|
||||
toDrv = data:
|
||||
buildGoPackage rec {
|
||||
inherit (data) pname version;
|
||||
name = "${pname}-${version}";
|
||||
goPackagePath = "github.com/${data.src.owner}/${data.src.repo}";
|
||||
src = fetchFromGitHub data.src;
|
||||
inherit (data) owner repo version sha256;
|
||||
name = "${repo}-${version}";
|
||||
goPackagePath = "github.com/${owner}/${repo}";
|
||||
src = fetchFromGitHub {
|
||||
inherit owner repo sha256;
|
||||
rev = "v${version}";
|
||||
};
|
||||
};
|
||||
|
||||
maybeDrv = name: data:
|
||||
# vsphere is currently broken
|
||||
if name == "vsphere" then null
|
||||
else toDrv data;
|
||||
in
|
||||
lib.mapAttrs toDrv list
|
||||
lib.mapAttrs maybeDrv list
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "terraform-provider-template";
|
||||
name = "${pname}-${version}";
|
||||
version = "0.1.1";
|
||||
|
||||
goPackagePath = "github.com/terraform-providers/terraform-provider-template";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terraform-providers";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1qrslnkvcj18jzxmsbf72gm54s8dnw5k5z15nffwgy09vv7mzpcn";
|
||||
};
|
||||
}
|
||||
@ -10,18 +10,19 @@ set -euo pipefail
|
||||
GET() {
|
||||
local url=$1
|
||||
echo "fetching $url" >&2
|
||||
curl -#fL "$url"
|
||||
curl -#fL -u "$GITHUB_AUTH" "$url"
|
||||
}
|
||||
|
||||
get_org_repos() {
|
||||
local org=$1
|
||||
GET "https://api.github.com/orgs/$org/repos" | jq -r '.[].name'
|
||||
local page=1
|
||||
GET "https://api.github.com/orgs/$org/repos?per_page=100" | jq -r '.[].name'
|
||||
}
|
||||
|
||||
get_repo_tags() {
|
||||
local owner=$1
|
||||
local repo=$2
|
||||
GET "https://api.github.com/repos/$owner/$repo/git/refs/tags" | \
|
||||
GET "https://api.github.com/repos/$owner/$repo/git/refs/tags?per_page=100" | \
|
||||
jq -r '.[].ref' | \
|
||||
cut -d '/' -f 3- | \
|
||||
sort --version-sort
|
||||
@ -37,25 +38,37 @@ prefetch_github() {
|
||||
echo_entry() {
|
||||
local owner=$1
|
||||
local repo=$2
|
||||
local rev=$3
|
||||
local sha256=$4
|
||||
local version=${3:1}
|
||||
local sha256=$4
|
||||
cat <<EOF
|
||||
{
|
||||
pname = "$repo";
|
||||
owner = "$owner";
|
||||
repo = "$repo";
|
||||
version = "$version";
|
||||
src = {
|
||||
owner = "$owner";
|
||||
repo = "$repo";
|
||||
rev = "$rev";
|
||||
sha256 = "$sha256";
|
||||
};
|
||||
sha256 = "$sha256";
|
||||
};
|
||||
EOF
|
||||
}
|
||||
|
||||
indent() { sed 's/^/ /'; }
|
||||
|
||||
## Main ##
|
||||
|
||||
cd "$(dirname "$0")"
|
||||
|
||||
if [[ -z "${GITHUB_AUTH:-}" ]]; then
|
||||
cat <<'HELP'
|
||||
Missing the GITHUB_AUTH env. Thi is required to work around the 60 request
|
||||
per hour rate-limit.
|
||||
|
||||
Go to https://github.com/settings/tokens and create a new token with the
|
||||
"public_repo" scope.
|
||||
|
||||
Then `export GITHUB_AUTH=<your user>:<your token>` and run this script again.
|
||||
HELP
|
||||
exit 1
|
||||
fi
|
||||
|
||||
org=terraform-providers
|
||||
|
||||
repos=$(get_org_repos "$org" | grep terraform-provider- | sort)
|
||||
@ -63,9 +76,11 @@ repos=$(get_org_repos "$org" | grep terraform-provider- | sort)
|
||||
|
||||
# Get all the providers with index
|
||||
|
||||
echo -n > data.nix
|
||||
cat <<HEADER > data.nix
|
||||
# Generated with ./update-all
|
||||
{
|
||||
HEADER
|
||||
|
||||
echo "{" >> data.nix
|
||||
for repo in $repos; do
|
||||
echo "*** $repo ***"
|
||||
name=$(echo "$repo" | cut -d - -f 3-)
|
||||
@ -77,6 +92,9 @@ for repo in $repos; do
|
||||
echo_entry "$org" "$repo" "$last_tag" "$last_tag_sha256" | indent
|
||||
} >> data.nix
|
||||
done
|
||||
echo "}" >> data.nix
|
||||
|
||||
cat <<FOOTER >> data.nix
|
||||
}
|
||||
FOOTER
|
||||
|
||||
echo Done.
|
||||
|
||||
@ -24,10 +24,10 @@
|
||||
let
|
||||
# NOTE: When updating, please also update in current stable,
|
||||
# as older versions stop working
|
||||
version = "33.4.23";
|
||||
version = "34.4.20";
|
||||
sha256 = {
|
||||
"x86_64-linux" = "0z8sd71v0xfbq4x8gw0rjhg7kbd7r0465b1cqk1ls2fivb25qqxz";
|
||||
"i686-linux" = "07sj1ixpml56bx83jawslak6scb12wxwn53nnabvgnivhb9vzq97";
|
||||
"x86_64-linux" = "04yc0sf4w4p86f2rpph4g4qhd4wxlsyhiwcf4201xadnnjj11gzz";
|
||||
"i686-linux" = "0ch5yxw1n6mwa6050pd10f5z3ys2yca9n8ccjlqi2d2aa4qcxsmr";
|
||||
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
|
||||
|
||||
arch = {
|
||||
|
||||
@ -2,13 +2,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rssguard-${version}";
|
||||
version = "3.4.0";
|
||||
version = "3.4.2";
|
||||
|
||||
src = fetchgit {
|
||||
url = https://github.com/martinrotter/rssguard;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "1cdpfjj2lm1q2qh0w0mh505blcmi4n78458d3z3c1zn9ls9b9zsp";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "0iy0fd3qr2dm0pc6xr7sin6cjfxfa0pxhxiwzs55dhsdk9zir62s";
|
||||
# Submodules are required only for Windows (and one of them is a huge binary
|
||||
# package ~400MB). See project wiki for more details.
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
|
||||
buildInputs = [ qtwebengine qttools ];
|
||||
|
||||
@ -1,24 +1,27 @@
|
||||
{stdenv, fetchurl, openssl, curl, ncurses, libjpeg
|
||||
{stdenv, fetchurl, gnused, openssl, curl, ncurses, libjpeg
|
||||
, withGpg ? true, gpgme ? null}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.22.10";
|
||||
debPatch = "2";
|
||||
name = "centerim-${version}";
|
||||
version = "5.0.1";
|
||||
name = "centerim5-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://centerim.org/download/releases/${name}.tar.gz";
|
||||
url = "http://centerim.org/download/cim5/${name}.tar.gz";
|
||||
sha256 = "0viz86jflp684vfginhl6aaw4gh2qvalc25anlwljjl3kkmibklk";
|
||||
};
|
||||
patches = fetchurl {
|
||||
url = "mirror://debian/pool/main/c/centerim/centerim_${version}-${debPatch}.diff.gz";
|
||||
sha256 = "18iz3hkvr31jsyznryvyldxm9ckyrpy9sczxikrnw2i2r1xyfj8m";
|
||||
};
|
||||
|
||||
CXXFLAGS = "-std=gnu++98";
|
||||
|
||||
buildInputs = [ openssl curl ncurses libjpeg ]
|
||||
++ stdenv.lib.optional withGpg gpgme;
|
||||
|
||||
configureFlags = [ "--with-openssl=${openssl.dev}" ];
|
||||
preConfigure = ''
|
||||
${gnused}/bin/sed -i '1,1i#include <stdio.h>' libicq2000/libicq2000/sigslot.h
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-openssl=${openssl.dev}"
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = http://www.centerim.org/;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, makeDesktopItem
|
||||
{ stdenv, fetchurl, dpkg
|
||||
, xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig
|
||||
, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify }:
|
||||
|
||||
@ -6,7 +6,7 @@ let
|
||||
bits = if stdenv.system == "x86_64-linux" then "x64"
|
||||
else "ia32";
|
||||
|
||||
version = "0.5.10";
|
||||
version = "0.5.12";
|
||||
|
||||
runtimeDeps = [
|
||||
udev libnotify
|
||||
@ -18,53 +18,45 @@ let
|
||||
gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
|
||||
gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc
|
||||
] ++ runtimeDeps;
|
||||
|
||||
myIcon = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/saenzramiro/rambox/9e4444e6297dd35743b79fe23f8d451a104028d5/resources/Icon.png";
|
||||
sha256 = "0r00l4r5mlbgn689i3rp6ks11fgs4h2flvrlggvm2qdd974d1x0b";
|
||||
};
|
||||
desktopItem = makeDesktopItem rec {
|
||||
name = "Rambox";
|
||||
exec = "rambox";
|
||||
icon = myIcon;
|
||||
desktopName = name;
|
||||
genericName = "Rambox messenger";
|
||||
categories = "Network;";
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "rambox-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox-${version}-${bits}.tar.gz";
|
||||
url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox_${version}-${bits}.deb";
|
||||
sha256 = if bits == "x64" then
|
||||
"1i5jbhsfdbhr0rsb5w2pfpwjiagz47ppxk65qny3ay3lr4lbccn3" else
|
||||
"1p1m6vsa9xvl3pjf3pygvllyk7j4q9vnlzmrizb8f5q30fpls25x";
|
||||
"1jlvpq7wryz4vf6xlsb9c38jrhjiv18rdf2ndlv76png60wl8418" else
|
||||
"063j3gcpp18wdvspy7d43cgv7i5v8c42hn2zpp083jixw9ddsqwa";
|
||||
};
|
||||
|
||||
# don't remove runtime deps
|
||||
dontPatchELF = true;
|
||||
|
||||
buildInputs = [ dpkg ];
|
||||
|
||||
unpackPhase = "dpkg-deb -x $src .";
|
||||
|
||||
installPhase = ''
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" rambox
|
||||
patchelf --set-rpath "$out/opt/rambox:${stdenv.lib.makeLibraryPath deps}" rambox
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" opt/Rambox/rambox
|
||||
patchelf --set-rpath "$out/opt/Rambox:${stdenv.lib.makeLibraryPath deps}" opt/Rambox/rambox
|
||||
|
||||
mkdir -p $out/bin $out/opt/rambox
|
||||
cp -r * $out/opt/rambox
|
||||
ln -s $out/opt/rambox/rambox $out/bin
|
||||
mkdir -p $out/bin
|
||||
cp -r opt $out
|
||||
ln -s $out/opt/Rambox/rambox $out/bin
|
||||
|
||||
# provide desktop item
|
||||
mkdir -p $out/share/applications
|
||||
ln -s ${desktopItem}/share/applications/* $out/share/applications
|
||||
# provide resources
|
||||
cp -r usr/share $out
|
||||
substituteInPlace $out/share/applications/rambox.desktop \
|
||||
--replace Exec=\"/opt/Rambox/rambox\" Exec=rambox
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
paxmark m $out/opt/rambox/rambox
|
||||
paxmark m $out/opt/Rambox/rambox
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Free and Open Source messaging and emailing app that combines common web applications into one";
|
||||
homepage = http://rambox.pro;
|
||||
license = licenses.mit;
|
||||
maintainers = [ stdenv.lib.maintainers.gnidorah ];
|
||||
maintainers = [ maintainers.gnidorah ];
|
||||
platforms = ["i686-linux" "x86_64-linux"];
|
||||
hydraPlatforms = [];
|
||||
};
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ stdenv, fetchurl, dpkg, makeWrapper
|
||||
, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib, gnome2
|
||||
, libnotify, nspr, nss, systemd, xorg }:
|
||||
, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib, glibc, gnome2, libsecret
|
||||
, libnotify, nspr, nss, systemd, xorg, libv4l, libstdcxx5 }:
|
||||
|
||||
let
|
||||
|
||||
version = "5.3.0.1";
|
||||
version = "5.4.0.1";
|
||||
|
||||
rpath = stdenv.lib.makeLibraryPath [
|
||||
alsaLib
|
||||
@ -17,6 +17,9 @@ let
|
||||
fontconfig
|
||||
freetype
|
||||
glib
|
||||
libsecret
|
||||
glibc
|
||||
libstdcxx5
|
||||
|
||||
gnome2.GConf
|
||||
gnome2.gdk_pixbuf
|
||||
@ -30,6 +33,7 @@ let
|
||||
nss
|
||||
stdenv.cc.cc
|
||||
systemd
|
||||
libv4l
|
||||
|
||||
xorg.libxkbfile
|
||||
xorg.libX11
|
||||
@ -50,7 +54,7 @@ let
|
||||
if stdenv.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb";
|
||||
sha256 = "08sf9nqnznsydw4965w7ixwwba54hjc02ga7vcnz9vpx5hln3nrz";
|
||||
sha256 = "1idjgmn0kym7jml30xq6zrcp8qinx64kgnxlw8m0ys4z6zlw0c8z";
|
||||
}
|
||||
else
|
||||
throw "Skype for linux is not supported on ${stdenv.system}";
|
||||
@ -77,9 +81,10 @@ in stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
patchelf \
|
||||
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--set-rpath "$out/share/skypeforlinux:${rpath}" "$out/share/skypeforlinux/skypeforlinux"
|
||||
for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* -or -name \*.node\* \) ); do
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
|
||||
patchelf --set-rpath ${rpath}:$out/share/skypeforlinux $file || true
|
||||
done
|
||||
|
||||
ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux"
|
||||
|
||||
|
||||
@ -2,17 +2,16 @@
|
||||
python27, python27Packages}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "201409.1";
|
||||
build_nr = "13892";
|
||||
version = "201707";
|
||||
build_nr = "1";
|
||||
name = "mcrl2-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.mcrl2.org/download/devel/mcrl2-${version}.${build_nr}.tar.gz";
|
||||
sha256 = "0cknpind6rma12q93rbm638ijhy8sj8nd20wnw8l0f651wm0x036";
|
||||
url = "http://www.mcrl2.org/download/release/mcrl2-${version}.${build_nr}.tar.gz";
|
||||
sha256 = "1c8h94ja7271ph61zrcgnjgblxppld6v22f7f900prjgzbcfy14m";
|
||||
};
|
||||
|
||||
buildInputs = [ xlibs.libX11 cmake subversion mesa qt5.qtbase boost
|
||||
python27 python27Packages.pyyaml python27Packages.psutil ];
|
||||
buildInputs = [ cmake mesa qt5.qtbase boost ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@ -1,58 +1,64 @@
|
||||
{ stdenv
|
||||
, openblas
|
||||
, boost
|
||||
, cudaSupport ? true
|
||||
, cudnnSupport ? false
|
||||
, cudnn ? null
|
||||
, cudatoolkit7
|
||||
{ stdenv, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, boost
|
||||
, google-gflags
|
||||
, glog
|
||||
, hdf5
|
||||
, hdf5-cpp
|
||||
, leveldb
|
||||
, lmdb
|
||||
, opencv
|
||||
, protobuf
|
||||
, snappy
|
||||
, atlas
|
||||
, doxygen
|
||||
, cudaSupport ? true, cudatoolkit
|
||||
, cudnnSupport ? false, cudnn ? null
|
||||
, pythonSupport ? false, python ? null, numpy ? null
|
||||
}:
|
||||
|
||||
assert cudnnSupport -> cudaSupport;
|
||||
assert pythonSupport -> (python != null && numpy != null);
|
||||
|
||||
let optional = stdenv.lib.optional;
|
||||
in stdenv.mkDerivation rec {
|
||||
# Use git revision because latest "release" is really old
|
||||
name = "caffe-git-2015-07-02";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "caffe-${version}";
|
||||
version = "1.0-rc5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BVLC";
|
||||
repo = "caffe";
|
||||
rev = "77d66dfc907dd875d69bb9fc12dd950b531e464f";
|
||||
sha256 = "0vd4qrc49dhsawj298xpkd5mvi35sh56kdswx3yp8ya4fjajwakx";
|
||||
rev = "rc5";
|
||||
sha256 = "0lfmmc0n6xvkpygvxclzrvd0zigb4yfc5612anv2ahlxpfi9031c";
|
||||
};
|
||||
|
||||
preConfigure = "mv Makefile.config.example Makefile.config";
|
||||
enableParallelBuilding = true;
|
||||
|
||||
makeFlags = "BLAS=open " +
|
||||
(if !cudaSupport then "CPU_ONLY=1 " else "CUDA_DIR=${cudatoolkit7} ") +
|
||||
(if cudnnSupport then "USE_CUDNN=1 " else "");
|
||||
nativeBuildInputs = [ cmake doxygen ];
|
||||
|
||||
# too many issues with tests to run them for now
|
||||
doCheck = false;
|
||||
checkPhase = "make runtest ${makeFlags}";
|
||||
cmakeFlags = [ "-DCUDA_ARCH_NAME=All" ]
|
||||
++ lib.optional (!cudaSupport) "-DCPU_ONLY=ON"
|
||||
++ lib.optional (!pythonSupport) "-DBUILD_python=OFF";
|
||||
|
||||
buildInputs = [ openblas boost google-gflags glog hdf5 leveldb lmdb opencv
|
||||
protobuf snappy ]
|
||||
++ optional cudaSupport cudatoolkit7
|
||||
++ optional cudnnSupport cudnn;
|
||||
buildInputs = [ boost google-gflags glog protobuf hdf5-cpp lmdb leveldb snappy opencv atlas ]
|
||||
++ lib.optional cudaSupport cudatoolkit
|
||||
++ lib.optional cudnnSupport cudnn
|
||||
++ lib.optionals pythonSupport [ python numpy ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/{bin,share,lib}
|
||||
for bin in $(find build/tools -executable -type f -name '*.bin');
|
||||
do
|
||||
cp $bin $out/bin/$(basename $bin .bin)
|
||||
done
|
||||
propagatedBuildInputs = lib.optional pythonSupport python.pkgs.protobuf;
|
||||
|
||||
cp -r build/examples $out/share
|
||||
cp -r build/lib $out
|
||||
outputs = [ "out" "bin" ];
|
||||
# Don't propagate bin.
|
||||
outputBin = "out";
|
||||
|
||||
postInstall = ''
|
||||
# Internal static library.
|
||||
rm $out/lib/libproto.a
|
||||
|
||||
moveToOutput "bin" "$bin"
|
||||
'' + lib.optionalString pythonSupport ''
|
||||
mkdir -p $out/${python.sitePackages}
|
||||
mv $out/python/caffe $out/${python.sitePackages}
|
||||
rm -rf $out/python
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -2,16 +2,23 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "terminology-${version}";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.xz";
|
||||
sha256 = "13rl1k22yf8qrpzdm5nh6ij641fibadr2ww1r7rnz7mbhzj3d4gb";
|
||||
sha256 = "05ncxvzb9rzkyjvd95hzn8lswqdwr8cix6rd54nqn9559jibh4ns";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ (pkgconfig.override { vanilla = true; }) makeWrapper ];
|
||||
nativeBuildInputs = [
|
||||
(pkgconfig.override { vanilla = true; })
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [ efl pcre curl ];
|
||||
buildInputs = [
|
||||
efl
|
||||
pcre
|
||||
curl
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
for f in $out/bin/*; do
|
||||
|
||||
@ -66,6 +66,8 @@ let overridden = set // overrides; set = with overridden; {
|
||||
|
||||
gtkhtml = callPackage ./platform/gtkhtml { };
|
||||
|
||||
gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { };
|
||||
|
||||
# Required for nautilus
|
||||
inherit (libunique);
|
||||
|
||||
|
||||
15
pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
Normal file
15
pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
Normal file
@ -0,0 +1,15 @@
|
||||
{ stdenv, fetchurl, pkgconfig, gtk3, intltool,
|
||||
GConf, enchant, isocodes, gnome_icon_theme, gsettings_desktop_schemas }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.10.0";
|
||||
name = "gtkhtml-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gtkhtml/4.10/${name}.tar.xz";
|
||||
sha256 = "1hq6asgb5n9q3ryx2vngr4jyi8lg65lzpnlgrgcwayiczcj68fya";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ gsettings_desktop_schemas gtk3 gnome_icon_theme GConf ];
|
||||
buildInputs = [pkgconfig intltool enchant isocodes ];
|
||||
}
|
||||
@ -59,7 +59,7 @@ assert langGo -> langCC;
|
||||
with stdenv.lib;
|
||||
with builtins;
|
||||
|
||||
let version = "7.1.0";
|
||||
let version = "7.2.0";
|
||||
|
||||
# Whether building a cross-compiler for GNU/Hurd.
|
||||
crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
|
||||
@ -213,8 +213,8 @@ stdenv.mkDerivation ({
|
||||
builder = ../builder.sh;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.bz2";
|
||||
sha256 = "05xwps0ci7wgxh50askpa2r9p8518qxdgh6ad7pnyk7n6p13d0ca";
|
||||
url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
|
||||
sha256 = "16j7i0888j2f1yp9l0nhji6cq65dy6y4nwy8868a8njbzzwavxqw";
|
||||
};
|
||||
|
||||
inherit patches;
|
||||
|
||||
@ -899,4 +899,7 @@ self: super: {
|
||||
sha256 = "1vss7b99zrhw3r29krl1b60r4qk0m2mpwmrz8q8zdxrh33hb8pd7";
|
||||
});
|
||||
|
||||
# happy 1.19.6 and later break some packages.
|
||||
Agda = super.Agda.override { happy = self.happy_1_19_5; };
|
||||
|
||||
}
|
||||
|
||||
@ -162,4 +162,7 @@ self: super: {
|
||||
comonad = dontCheck super.comonad;
|
||||
semigroupoids = dontCheck super.semigroupoids;
|
||||
|
||||
# https://github.com/simonmar/happy/issues/103
|
||||
happy = super.happy.override { mtl = self.mtl_2_2_1; };
|
||||
|
||||
}
|
||||
|
||||
@ -36,6 +36,11 @@ self: super: {
|
||||
unix = null;
|
||||
xhtml = null;
|
||||
|
||||
# Make sure we can still build Cabal 1.x.
|
||||
Cabal_1_24_2_0 = overrideCabal super.Cabal_1_24_2_0 (drv: {
|
||||
prePatch = "sed -i -e 's/process.*< 1.5,/process,/g' Cabal.cabal";
|
||||
});
|
||||
|
||||
# cabal-install can use the native Cabal library.
|
||||
cabal-install = super.cabal-install.override { Cabal = null; };
|
||||
|
||||
@ -63,9 +68,26 @@ self: super: {
|
||||
protolude = doJailbreak super.protolude;
|
||||
quickcheck-instances = doJailbreak super.quickcheck-instances;
|
||||
|
||||
# https://github.com/aristidb/aws/issues/238
|
||||
aws = doJailbreak super.aws;
|
||||
|
||||
# https://github.com/jgm/pandoc/issues/3876
|
||||
pandoc = let fixSetup = pkgs.fetchpatch {
|
||||
url = "https://github.com/jgm/pandoc/pull/3899.patch";
|
||||
sha256 = "0lk9vs2l1wc1kr0y8fkdcarfi4sjd3dl81r52n39r25xx9kqawv7";
|
||||
};
|
||||
in overrideCabal super.pandoc (drv: {
|
||||
editedCabalFile = null;
|
||||
patches = drv.patches or [] ++ [fixSetup];
|
||||
setupHaskellDepends = drv.setupHaskellDepends or [self.Cabal_1_24_2_0];
|
||||
preCompileBuildDriver = "setupCompileFlags+=' -package=Cabal-1.24.2.0'";
|
||||
});
|
||||
|
||||
# LTS-9 versions do not compile.
|
||||
path = dontCheck super.path;
|
||||
path-io = super.path-io_1_3_3;
|
||||
trifecta = super.trifecta_1_7_1_1;
|
||||
aeson-compat = dontCheck super.aeson-compat_0_3_7_1; # test suite needs QuickCheck 2.10.*
|
||||
binary-orphans = dontCheck super.binary-orphans_0_1_7_0; # test suite needs QuickCheck 2.10.*
|
||||
|
||||
}
|
||||
|
||||
@ -2535,6 +2535,8 @@ extra-packages:
|
||||
- haddock-api == 2.15.* # required on GHC 7.8.x
|
||||
- haddock-api == 2.16.* # required on GHC 7.10.x
|
||||
- haddock-library == 1.2.* # required for haddock-api-2.16.x
|
||||
- happy <1.19.6 # newer versions break Agda
|
||||
- haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support
|
||||
- haskell-src-exts == 1.18.* # required by hoogle-5.0.4
|
||||
- mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
|
||||
- mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms
|
||||
@ -2807,9 +2809,12 @@ dont-distribute-packages:
|
||||
Agata: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
Agda-executable: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
agda-server: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
agda-snippets-hakyll: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
agda-snippets: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
agentx: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
AGI: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
AhoCorasick: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
aip: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
airbrake: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
air-th: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
aivika-distributed: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -2944,10 +2949,11 @@ dont-distribute-packages:
|
||||
attic-schedule: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
AttoBencode: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
AttoJson: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
attoparsec-data: [ "x86_64-darwin" ]
|
||||
attoparsec-data: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
attoparsec-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
attoparsec-text-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
attoparsec-text: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
attoparsec-time: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
attoparsec-trans: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
attosplit: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
Attrac: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -3646,11 +3652,18 @@ dont-distribute-packages:
|
||||
crypto-classical: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
cryptoconditions: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
crypto-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
crypto-multihash: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
crypto-random-effect: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
crypto-simple: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
cryptsy-api: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
crystalfontz: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
cse-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
csound-catalog: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
csound-expression-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
csound-expression: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
csound-expression-opcodes: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
csound-expression-typed: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
csound-sampler: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
cspmchecker: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
CSPM-cspm: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
CSPM-FiringRules: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -4119,6 +4132,7 @@ dont-distribute-packages:
|
||||
explore: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
ex-pool: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
exposed-containers: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
expressions: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
extcore: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
extemp: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
extended-categories: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -4204,6 +4218,7 @@ dont-distribute-packages:
|
||||
filesystem-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
FileSystem: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
filesystem-trees: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
fillit: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
filtrable: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
Finance-Quote-Yahoo: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
Finance-Treasury: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -4251,6 +4266,7 @@ dont-distribute-packages:
|
||||
FM-SBLEX: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
fn-extra: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
foldl-incremental: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
foldl-statistics: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
folds-common: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
follower: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
foma: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -4312,6 +4328,7 @@ dont-distribute-packages:
|
||||
fs-events: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
fsh-csv: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
fsmActions: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
fsnotify-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
fsutils: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
fswatcher: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
ftdi: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -4370,6 +4387,7 @@ dont-distribute-packages:
|
||||
generators: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
generic-binary: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
generic-church: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
generic-lens: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
generic-maybe: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
generic-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
genericserialize: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -4424,6 +4442,7 @@ dont-distribute-packages:
|
||||
ghc-parser: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
ghc-pkg-autofix: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
ghc-pkg-lib: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
ghc-proofs: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
ghc-session: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
ghc-simple: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
ghc-syb: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -4433,6 +4452,7 @@ dont-distribute-packages:
|
||||
giak: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
gi-cairo: [ "x86_64-darwin" ]
|
||||
Gifcurry: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
gi-gdkx11: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
gi-gdk: [ "x86_64-darwin" ]
|
||||
gi-ggit: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
gi-gstpbutils: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -4544,6 +4564,7 @@ dont-distribute-packages:
|
||||
gpx-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
GPX: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
graceful: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
grakn: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
grammar-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
GrammarProducts: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
grammatical-parsers: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -4977,6 +4998,7 @@ dont-distribute-packages:
|
||||
hexml-lens: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hexpat-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hexpat-pickle-generic: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hexpress: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hexpr: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hexquote: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hF2: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -5056,6 +5078,7 @@ dont-distribute-packages:
|
||||
hipbot: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hipchat-hs: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hipe: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hip: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
HipmunkPlayground: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
Hipmunk-Utils: [ "x86_64-darwin" ]
|
||||
Hipmunk: [ "x86_64-darwin" ]
|
||||
@ -5084,6 +5107,7 @@ dont-distribute-packages:
|
||||
HLearn-datastructures: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
HLearn-distributions: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hledger-chart: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hledger-iadd: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hledger-vty: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hlibBladeRF: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hlibev: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -5100,7 +5124,7 @@ dont-distribute-packages:
|
||||
hmarkup: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hmatrix-banded: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hmatrix-mmap: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hmatrix-morpheus: [ "x86_64-darwin" ]
|
||||
hmatrix-morpheus: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hmatrix-nipals: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hmatrix-nlopt: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hmatrix-quadprogpp: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -5120,6 +5144,7 @@ dont-distribute-packages:
|
||||
Hmpf: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hmumps: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hnetcdf: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hnix: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
HNM: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hnormalise: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hoauth: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -5137,11 +5162,11 @@ dont-distribute-packages:
|
||||
hois: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hold-em: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hole: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hol: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
Holumbus-Distribution: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
Holumbus-MapReduce: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
Holumbus-Searchengine: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
Holumbus-Storage: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hol: [ "x86_64-darwin" ]
|
||||
homeomorphic: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hommage: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
homplexity: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -5420,7 +5445,7 @@ dont-distribute-packages:
|
||||
hwsl2-bytevector: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hwsl2: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hwsl2-reducers: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
hw-xml: [ "x86_64-darwin" ]
|
||||
hw-xml: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
H: [ "x86_64-darwin" ]
|
||||
hXmixer: [ "x86_64-darwin" ]
|
||||
hxmppc: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -5600,6 +5625,7 @@ dont-distribute-packages:
|
||||
iyql: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
j2hs: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
jack-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
jack: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
jackminimix: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
JackMiniMix: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
jack: [ "x86_64-darwin" ]
|
||||
@ -5620,6 +5646,7 @@ dont-distribute-packages:
|
||||
jcdecaux-vls: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
Jdh: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
jdi: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
jenkinsPlugins2nix: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
jespresso: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
jobqueue: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
join: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -5792,6 +5819,8 @@ dont-distribute-packages:
|
||||
language-pig: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
language-puppet: [ "x86_64-darwin" ]
|
||||
language-python-colour: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
language-python: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
language-python-test: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
language-qux: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
language-sh: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
language-spelling: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -5927,6 +5956,7 @@ dont-distribute-packages:
|
||||
list-zip-def: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
literals: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
lit: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
live-sequencer: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
ll-picosat: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
llsd: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
llvm-analysis: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -6119,6 +6149,7 @@ dont-distribute-packages:
|
||||
memo-ptr: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
memo-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
merge-bash-history: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
merkle-patricia-db: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
messente: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
metadata: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
MetaHDBC: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -6141,8 +6172,12 @@ dont-distribute-packages:
|
||||
MicrosoftTranslator: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
mida: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
midair: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
midi-alsa: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
midi: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
midimory: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
midi-music-box: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
midisurface: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
midi-util: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
midi-utils: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
mighttpd: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
mi: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -6245,6 +6280,7 @@ dont-distribute-packages:
|
||||
morph: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
mosaico-lib: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
mount: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
movie-monad: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
mp3decoder: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
mpdmate: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
mp: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -6731,6 +6767,7 @@ dont-distribute-packages:
|
||||
plot-gtk3: [ "x86_64-darwin" ]
|
||||
Plot-ho-matic: [ "x86_64-darwin" ]
|
||||
plot-lab: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
plot-light: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
PlslTools: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
plugins-auto: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
plugins-multistage: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -6785,6 +6822,7 @@ dont-distribute-packages:
|
||||
postgresql-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
postgresql-typed: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
postgresql-typed-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
postgrest: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
postie: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
postmark: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
postmark-streams: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -6996,6 +7034,7 @@ dont-distribute-packages:
|
||||
react-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
reaction-logic: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
reactive-bacon: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
reactive-balsa: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
reactive-banana-gi-gtk: [ "x86_64-darwin" ]
|
||||
reactive-banana-sdl2: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
reactive-banana-sdl: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -7004,7 +7043,9 @@ dont-distribute-packages:
|
||||
reactive-fieldtrip: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
reactive-glut: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
reactive: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
reactive-jack: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
reactive-jack: [ "x86_64-darwin" ]
|
||||
reactive-midyim: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
reactive-thread: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
reactor: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
react-tutorial-haskell-server: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -7105,6 +7146,7 @@ dont-distribute-packages:
|
||||
representable-functors: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
representable-tries: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
repr: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
reprinter: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
reqcatcher: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
req-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
req: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -7607,6 +7649,7 @@ dont-distribute-packages:
|
||||
sql-simple-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
sqlvalue-list: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
sqsd-local: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
squeal-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
srcinst: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
sscan: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
sscgi: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -7618,6 +7661,7 @@ dont-distribute-packages:
|
||||
stable-maps: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
stable-tree: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
stack2nix: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
stackage2nix: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
stackage-build-plan: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
stackage-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
stackage: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -7710,6 +7754,7 @@ dont-distribute-packages:
|
||||
svgutils: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
svm-simple: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
svndump: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
swagger-test: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
swapper: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
swearjure: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
swf: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -7738,9 +7783,11 @@ dont-distribute-packages:
|
||||
syntax-printer: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
syntax-trees-fork-bairyn: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
syntax-trees: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
synthesizer-alsa: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
synthesizer-filter: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
synthesizer: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
synthesizer-llvm: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
synthesizer-midi: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
sysinfo: [ "x86_64-darwin" ]
|
||||
Sysmon: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
system-canonicalpath: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -8241,6 +8288,7 @@ dont-distribute-packages:
|
||||
wai-middleware-verbs: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
wai-responsible: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
wai-router: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
wai-secure-cookies: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
wai-session-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
wai-session-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
wai-session-tokyocabinet: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
@ -8364,6 +8412,7 @@ dont-distribute-packages:
|
||||
x509-util: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
x86-64bit: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
xbattbar: [ "x86_64-darwin" ]
|
||||
xcffib: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
xchat-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
xcp: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
xdot: [ "x86_64-darwin" ]
|
||||
|
||||
@ -105,6 +105,12 @@ self: super: builtins.intersectAttrs super {
|
||||
configureFlags = "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka";
|
||||
});
|
||||
|
||||
# library has hard coded directories that need to be removed. Reported upstream here https://github.com/haskell-works/hw-kafka-client/issues/32
|
||||
hw-kafka-client = dontCheck (overrideCabal super.hw-kafka-client (drv: {
|
||||
preConfigure = "sed -i -e /extra-lib-dirs/d -e /include-dirs/d -e /librdkafka/d hw-kafka-client.cabal";
|
||||
configureFlags = "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka";
|
||||
}));
|
||||
|
||||
# Foreign dependency name clashes with another Haskell package.
|
||||
libarchive-conduit = super.libarchive-conduit.override { archive = pkgs.libarchive; };
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -151,12 +151,12 @@ let
|
||||
sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig
|
||||
'';
|
||||
|
||||
meta = {
|
||||
license = stdenv.lib.licenses.ruby;
|
||||
homepage = http://www.ruby-lang.org/en/;
|
||||
meta = with stdenv.lib; {
|
||||
description = "The Ruby language";
|
||||
maintainers = with stdenv.lib.maintainers; [ vrthra manveru ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
homepage = http://www.ruby-lang.org/en/;
|
||||
license = licenses.ruby;
|
||||
maintainers = with maintainers; [ vrthra manveru ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
||||
passthru = rec {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ fetchurl
|
||||
, version ? "2.6.10"
|
||||
, sha256 ? "364c0eee8e0c9e8ab4879c5035832e5a27f0c97292d2264af5ae0020585280f0"
|
||||
, version ? "2.6.13"
|
||||
, sha256 ? "1j98ww8cz9y4wwshg7p4i4acrmls3ywkyj1nlkh4k3bywwm50hfh"
|
||||
}:
|
||||
fetchurl {
|
||||
url = "http://production.cf.rubygems.org/rubygems/rubygems-${version}.tgz";
|
||||
|
||||
@ -1,18 +1,25 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, xlibsWrapper }:
|
||||
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, openblas, libpng, libjpeg
|
||||
, guiSupport ? false, libX11
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "19.4";
|
||||
version = "19.6";
|
||||
name = "dlib-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "davisking";
|
||||
repo = "dlib";
|
||||
rev ="v${version}";
|
||||
sha256 = "0zqa36i4s5i7n6284sp22qrhm3k37n9vqmpz068nm02vj9h0a2j4";
|
||||
sha256 = "1nlx4z53jnk7wysaxrzbyyqb65m45rw4g1fagazl2jvwh1qn49ds";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
rm -rf dlib/external
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
buildInputs = [ openblas libpng libjpeg ] ++ lib.optional guiSupport libX11;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A general purpose cross-platform C++ machine learning library";
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
{ stdenv, callPackage, fetchFromGitHub, python, ... } @ args:
|
||||
with stdenv.lib;
|
||||
let
|
||||
version = "3.14.5.10";
|
||||
sha256 = "08vhl84166x13b3cbx8y0g99yqx772zd33gawsa1nxqkyrykql6k";
|
||||
in
|
||||
(callPackage ./generic.nix (args // {
|
||||
inherit version sha256;
|
||||
})).overrideDerivation (oldAttrs:{
|
||||
patchPhase = [
|
||||
oldAttrs.patchPhase
|
||||
"sed -i 's,#!/usr/bin/python,#!${python}/bin/python,' build/gyp_v8"
|
||||
];
|
||||
|
||||
# http://code.google.com/p/v8/issues/detail?id=2149
|
||||
NIX_CFLAGS_COMPILE = concatStringsSep " " [
|
||||
oldAttrs.NIX_CFLAGS_COMPILE
|
||||
"-Wno-unused-local-typedefs"
|
||||
"-Wno-aggressive-loop-optimizations"
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "v8";
|
||||
repo = "v8";
|
||||
rev = "${version}";
|
||||
inherit sha256;
|
||||
};
|
||||
})
|
||||
106
pkgs/development/libraries/webkitgtk/2.17.nix
Normal file
106
pkgs/development/libraries/webkitgtk/2.17.nix
Normal file
@ -0,0 +1,106 @@
|
||||
{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake
|
||||
, pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls
|
||||
, gtk2, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core
|
||||
, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit
|
||||
, libidn, libedit, readline, mesa, libintlOrEmpty
|
||||
, enableGeoLocation ? true, geoclue2, sqlite
|
||||
, gst-plugins-base, gst-plugins-bad
|
||||
}:
|
||||
|
||||
assert enableGeoLocation -> geoclue2 != null;
|
||||
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "webkitgtk-${version}";
|
||||
version = "2.17.91";
|
||||
|
||||
meta = {
|
||||
description = "Web content rendering engine, GTK+ port";
|
||||
homepage = http://webkitgtk.org/;
|
||||
license = licenses.bsd2;
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
hydraPlatforms = [];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
postConfigure = optionalString stdenv.isDarwin ''
|
||||
substituteInPlace Source/WebKit2/CMakeFiles/WebKit2.dir/link.txt \
|
||||
--replace "../../lib/libWTFGTK.a" ""
|
||||
substituteInPlace Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt \
|
||||
--replace "../../lib/libbmalloc.a" ""
|
||||
sed -i "s|[\./]*\.\./lib/lib[^\.]*\.a||g" \
|
||||
Source/JavaScriptCore/CMakeFiles/LLIntOffsetsExtractor.dir/link.txt \
|
||||
Source/JavaScriptCore/shell/CMakeFiles/jsc.dir/link.txt \
|
||||
Source/JavaScriptCore/shell/CMakeFiles/testb3.dir/link.txt \
|
||||
Source/WebKit2/CMakeFiles/DatabaseProcess.dir/link.txt \
|
||||
Source/WebKit2/CMakeFiles/NetworkProcess.dir/link.txt \
|
||||
Source/WebKit2/CMakeFiles/webkit2gtkinjectedbundle.dir/link.txt \
|
||||
Source/WebKit2/CMakeFiles/WebProcess.dir/link.txt
|
||||
substituteInPlace Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt \
|
||||
--replace "../../lib/libWTFGTK.a" "-Wl,-all_load ../../lib/libWTFGTK.a"
|
||||
'';
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://webkitgtk.org/releases/${name}.tar.xz";
|
||||
sha256 = "0f158gqb2lvv3v5z6s7gjgwms69fgsjkd8whfks8cq6cybiy9y37";
|
||||
};
|
||||
|
||||
# see if we can clean this up....
|
||||
|
||||
patches = [
|
||||
./finding-harfbuzz-icu.patch
|
||||
./gstreamergl-2.17.patch
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
./PR-152650-2.patch
|
||||
./PR-153138.patch
|
||||
./PR-157554.patch
|
||||
./PR-157574.patch
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPORT=GTK"
|
||||
"-DUSE_LIBHYPHEN=0"
|
||||
]
|
||||
++ optional stdenv.isLinux "-DENABLE_GLES2=ON"
|
||||
++ optionals stdenv.isDarwin [
|
||||
"-DUSE_SYSTEM_MALLOC=ON"
|
||||
"-DUSE_ACCELERATE=0"
|
||||
"-DENABLE_INTROSPECTION=ON"
|
||||
"-DENABLE_MINIBROWSER=OFF"
|
||||
"-DENABLE_PLUGIN_PROCESS_GTK2=OFF"
|
||||
"-DENABLE_MINIBROWSER=OFF"
|
||||
"-DENABLE_VIDEO=ON"
|
||||
"-DENABLE_QUARTZ_TARGET=ON"
|
||||
"-DENABLE_X11_TARGET=OFF"
|
||||
"-DENABLE_OPENGL=OFF"
|
||||
"-DENABLE_WEB_AUDIO=OFF"
|
||||
"-DENABLE_WEBGL=OFF"
|
||||
"-DENABLE_GRAPHICS_CONTEXT_3D=OFF"
|
||||
"-DENABLE_GTKDOC=OFF"
|
||||
];
|
||||
|
||||
# XXX: WebKit2 missing include path for gst-plugins-base.
|
||||
# Filled: https://bugs.webkit.org/show_bug.cgi?id=148894
|
||||
NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0 -I${gst-plugins-bad}/include/gstreamer-1.0"
|
||||
+ (optionalString stdenv.isDarwin " -lintl");
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake perl python2 ruby bison gperf sqlite
|
||||
pkgconfig gettext gobjectIntrospection
|
||||
];
|
||||
|
||||
buildInputs = libintlOrEmpty ++ [
|
||||
gtk2 libwebp enchant libnotify gnutls pcre nettle libidn
|
||||
libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit
|
||||
gst-plugins-base gst-plugins-bad libxkbcommon epoxy at_spi2_core
|
||||
] ++ optional enableGeoLocation geoclue2
|
||||
++ (with xlibs; [ libXdmcp libXt libXtst ])
|
||||
++ optionals stdenv.isDarwin [ libedit readline mesa ]
|
||||
++ optional stdenv.isLinux wayland;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
libsoup gtk3
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
}
|
||||
13
pkgs/development/libraries/webkitgtk/gstreamergl-2.17.patch
Normal file
13
pkgs/development/libraries/webkitgtk/gstreamergl-2.17.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git i/Source/cmake/OptionsGTK.cmake w/Source/cmake/OptionsGTK.cmake
|
||||
index d3577a8..9620dc0 100644
|
||||
--- i/Source/cmake/OptionsGTK.cmake
|
||||
+++ w/Source/cmake/OptionsGTK.cmake
|
||||
@@ -94,7 +94,7 @@ WEBKIT_OPTION_DEFINE(USE_LIBSECRET "Whether to enable the persistent credential
|
||||
|
||||
# Private options specific to the GTK+ port. Changing these options is
|
||||
# completely unsupported. They are intended for use only by WebKit developers.
|
||||
-WEBKIT_OPTION_DEFINE(USE_GSTREAMER_GL "Whether to enable support for GStreamer GL" PRIVATE ON)
|
||||
+WEBKIT_OPTION_DEFINE(USE_GSTREAMER_GL "Whether to enable support for GStreamer GL" PRIVATE OFF)
|
||||
WEBKIT_OPTION_DEFINE(USE_GSTREAMER_MPEGTS "Whether to enable support for MPEG-TS" PRIVATE OFF)
|
||||
WEBKIT_OPTION_DEFINE(USE_REDIRECTED_XCOMPOSITE_WINDOW "Whether to use a Redirected XComposite Window for accelerated compositing in X11." PRIVATE ON)
|
||||
|
||||
@ -0,0 +1,31 @@
|
||||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = ''clsql-sqlite3'';
|
||||
version = ''clsql-20160208-git'';
|
||||
|
||||
description = ''Common Lisp Sqlite3 Driver'';
|
||||
|
||||
deps = [ args."clsql" args."clsql-uffi" args."uffi" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = ''http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz'';
|
||||
sha256 = ''0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn'';
|
||||
};
|
||||
|
||||
packageName = "clsql-sqlite3";
|
||||
|
||||
asdFilesToKeep = ["clsql-sqlite3.asd"];
|
||||
overrides = x: x;
|
||||
}
|
||||
/* (SYSTEM clsql-sqlite3 DESCRIPTION Common Lisp Sqlite3 Driver SHA256
|
||||
0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn URL
|
||||
http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz
|
||||
MD5 d1da7688361337a7de4fe7452c225a06 NAME clsql-sqlite3 FILENAME
|
||||
clsql-sqlite3 DEPS
|
||||
((NAME clsql FILENAME clsql) (NAME clsql-uffi FILENAME clsql-uffi)
|
||||
(NAME uffi FILENAME uffi))
|
||||
DEPENDENCIES (clsql clsql-uffi uffi) VERSION clsql-20160208-git SIBLINGS
|
||||
(clsql-aodbc clsql-cffi clsql-mysql clsql-odbc clsql-postgresql-socket
|
||||
clsql-postgresql-socket3 clsql-postgresql clsql-sqlite clsql-tests
|
||||
clsql-uffi clsql)
|
||||
PARASITES NIL) */
|
||||
@ -38,6 +38,7 @@ cl-smtp
|
||||
clsql
|
||||
clsql-postgresql
|
||||
clsql-postgresql-socket
|
||||
clsql-sqlite3
|
||||
clss
|
||||
cl+ssl
|
||||
cl-syntax-annot
|
||||
|
||||
@ -1941,6 +1941,17 @@ let quicklisp-to-nix-packages = rec {
|
||||
}));
|
||||
|
||||
|
||||
"clsql-sqlite3" = buildLispPackage
|
||||
((f: x: (x // (f x)))
|
||||
(qlOverrides."clsql-sqlite3" or (x: {}))
|
||||
(import ./quicklisp-to-nix-output/clsql-sqlite3.nix {
|
||||
inherit fetchurl;
|
||||
"clsql" = quicklisp-to-nix-packages."clsql";
|
||||
"clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi";
|
||||
"uffi" = quicklisp-to-nix-packages."uffi";
|
||||
}));
|
||||
|
||||
|
||||
"clsql-postgresql-socket" = buildLispPackage
|
||||
((f: x: (x // (f x)))
|
||||
(qlOverrides."clsql-postgresql-socket" or (x: {}))
|
||||
|
||||
@ -1,33 +1,30 @@
|
||||
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, result }:
|
||||
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }:
|
||||
|
||||
let
|
||||
pname = "cmdliner";
|
||||
in
|
||||
|
||||
assert stdenv.lib.versionAtLeast ocaml.version "4.01.0";
|
||||
assert stdenv.lib.versionAtLeast ocaml.version "3.12";
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "ocaml-${pname}-${version}";
|
||||
version = "1.0.0";
|
||||
version = "0.9.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz";
|
||||
sha256 = "1ryn7qis0izg0wcal8zdlikzzl689l75y6f4zc6blrm93y5agy9x";
|
||||
sha256 = "0hdxlkgiwjml9dpaa80282a8350if7mc1m6yz2mrd7gci3fszykx";
|
||||
};
|
||||
|
||||
unpackCmd = "tar xjf $src";
|
||||
|
||||
nativeBuildInputs = [ ocamlbuild opam topkg ];
|
||||
nativeBuildInputs = [ ocamlbuild opam ];
|
||||
buildInputs = [ ocaml findlib ];
|
||||
propagatedBuildInputs = [ result ];
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
buildPhase = ''
|
||||
ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib pkg/pkg.ml build
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
configurePhase = "ocaml pkg/git.ml";
|
||||
buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true";
|
||||
installPhase = ''
|
||||
opam-installer --script --prefix=$out | sh
|
||||
ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/
|
||||
'';
|
||||
@ -1,30 +1,33 @@
|
||||
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }:
|
||||
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, result }:
|
||||
|
||||
let
|
||||
pname = "cmdliner";
|
||||
in
|
||||
|
||||
assert stdenv.lib.versionAtLeast ocaml.version "3.12";
|
||||
assert stdenv.lib.versionAtLeast ocaml.version "4.01.0";
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "ocaml-${pname}-${version}";
|
||||
version = "0.9.8";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz";
|
||||
sha256 = "0hdxlkgiwjml9dpaa80282a8350if7mc1m6yz2mrd7gci3fszykx";
|
||||
sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1";
|
||||
};
|
||||
|
||||
unpackCmd = "tar xjf $src";
|
||||
nativeBuildInputs = [ ocamlbuild opam ];
|
||||
|
||||
nativeBuildInputs = [ ocamlbuild opam topkg ];
|
||||
buildInputs = [ ocaml findlib ];
|
||||
propagatedBuildInputs = [ result ];
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
configurePhase = "ocaml pkg/git.ml";
|
||||
buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true";
|
||||
installPhase = ''
|
||||
buildPhase = ''
|
||||
ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib pkg/pkg.ml build
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
opam-installer --script --prefix=$out | sh
|
||||
ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/
|
||||
'';
|
||||
|
||||
@ -31,7 +31,7 @@ buildPythonPackage rec {
|
||||
# the fix for which hasn't been merged yet.
|
||||
|
||||
# keep Nose around since running the tests by hand is possible from Python or bash
|
||||
propagatedBuildInputs = [ stdenv nose numpy numpy.blas pydot_ng scipy six ];
|
||||
propagatedBuildInputs = [ nose numpy numpy.blas pydot_ng scipy six ];
|
||||
|
||||
meta = {
|
||||
homepage = http://deeplearning.net/software/theano/;
|
||||
|
||||
@ -9,16 +9,16 @@ let
|
||||
};
|
||||
setuptools_source = fetchPypi {
|
||||
pname = "setuptools";
|
||||
version = "36.0.1";
|
||||
version = "36.4.0";
|
||||
format = "wheel";
|
||||
sha256 = "f2900e560efc479938a219433c48f15a4ff4ecfe575a65de385eeb44f2425587";
|
||||
sha256 = "4d54c0bfee283e78609169213f9c075827d5837086f58b588b417b093c23464b";
|
||||
};
|
||||
|
||||
# TODO: Shouldn't be necessary anymore for pip > 9.0.1!
|
||||
# https://github.com/NixOS/nixpkgs/issues/26392
|
||||
# https://github.com/pypa/setuptools/issues/885
|
||||
pkg_resources = fetchurl {
|
||||
url = https://raw.githubusercontent.com/pypa/setuptools/v36.0.1/pkg_resources/__init__.py;
|
||||
url = "https://raw.githubusercontent.com/pypa/setuptools/v36.4.0/pkg_resources/__init__.py";
|
||||
sha256 = "1wdnq3mammk75mifkdmmjx7yhnpydvnvi804na8ym4mj934l2jkv";
|
||||
};
|
||||
|
||||
|
||||
@ -0,0 +1,27 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, django
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-multiselectfield";
|
||||
name = "${pname}-${version}";
|
||||
version = "0.1.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "52483d23aecbf6b502f9e6806e97da9288d5d7f2a3f99f736390763de68c8fd7";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ django ];
|
||||
|
||||
# No tests
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "django-multiselectfield";
|
||||
homepage = "https://github.com/goinnn/django-multiselectfield";
|
||||
license = lib.licenses.lgpl3;
|
||||
};
|
||||
}
|
||||
31
pkgs/development/python-modules/fixtures/default.nix
Normal file
31
pkgs/development/python-modules/fixtures/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pbr
|
||||
, testtools
|
||||
, mock
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fixtures";
|
||||
version = "3.0.0";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "fcf0d60234f1544da717a9738325812de1f42c2fa085e2d9252d8fff5712b2ef";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pbr testtools mock ];
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} -m testtools.run fixtures.test_suite
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Reusable state for writing clean tests and more";
|
||||
homepage = "https://pypi.python.org/pypi/fixtures";
|
||||
license = lib.licenses.asl20;
|
||||
};
|
||||
}
|
||||
35
pkgs/development/python-modules/keyring/default.nix
Normal file
35
pkgs/development/python-modules/keyring/default.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi
|
||||
, secretstorage
|
||||
, fs, gdata, python_keyczar, pyasn1, pycrypto, six, setuptools_scm
|
||||
, mock, pytest_28, pytestrunner }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "keyring";
|
||||
version = "10.4.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "09iv50c14mdmdk7sjd6bb47yg7347gymh6r8c0q4gfnzs173y6lh";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
fs gdata python_keyczar pyasn1 pycrypto six setuptools_scm
|
||||
];
|
||||
|
||||
checkInputs = [ mock pytest_28 pytestrunner ];
|
||||
|
||||
propagatedBuildInputs = [ secretstorage ];
|
||||
|
||||
checkPhase = ''
|
||||
py.test $out
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Store and access your passwords safely";
|
||||
homepage = "https://pypi.python.org/pypi/keyring";
|
||||
license = licenses.psfl;
|
||||
maintainers = with maintainers; [ lovek323 ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
32
pkgs/development/python-modules/logfury/default.nix
Normal file
32
pkgs/development/python-modules/logfury/default.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, funcsigs
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "logfury";
|
||||
name = "${pname}-${version}";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1lywirv3d1lw691mc4mfpz7ak6r49klri43bbfgdnvsfppxminj2";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
funcsigs
|
||||
six
|
||||
];
|
||||
|
||||
# No tests
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Logfury is for python library maintainers. It allows for responsible, low-boilerplate logging of method calls.";
|
||||
homepage = "https://github.com/ppolewicz/logfury";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ jwiegley ];
|
||||
};
|
||||
}
|
||||
@ -8,8 +8,10 @@ buildPythonPackage rec {
|
||||
inherit (protobuf) name src;
|
||||
inherit disabled doCheck;
|
||||
|
||||
# work around python distutils compiling C++ with $CC
|
||||
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
|
||||
NIX_CFLAGS_COMPILE =
|
||||
# work around python distutils compiling C++ with $CC
|
||||
optional stdenv.isDarwin "-I${libcxx}/include/c++/v1"
|
||||
++ optional (versionOlder protobuf.version "2.7.0") "-std=c++98";
|
||||
|
||||
propagatedBuildInputs = [ protobuf google_apputils ];
|
||||
buildInputs = [ google_apputils pyext ];
|
||||
|
||||
36
pkgs/development/python-modules/readme_renderer/default.nix
Normal file
36
pkgs/development/python-modules/readme_renderer/default.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytest
|
||||
, bleach
|
||||
, docutils
|
||||
, pygments
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "readme_renderer";
|
||||
version = "17.2";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9deab442963a63a71ab494bf581b1c844473995a2357f4b3228a1df1c8cba8da";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bleach docutils pygments six
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
py.test
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "readme_renderer is a library for rendering readme descriptions for Warehouse";
|
||||
homepage = https://github.com/pypa/readme_renderer;
|
||||
license = lib.licenses.asl20;
|
||||
};
|
||||
}
|
||||
34
pkgs/development/python-modules/restview/default.nix
Normal file
34
pkgs/development/python-modules/restview/default.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, docutils
|
||||
, readme_renderer
|
||||
, pygments
|
||||
, mock
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "restview";
|
||||
name = "${pname}-${version}";
|
||||
version = "2.7.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e7842100f3de179c68cfe7c2cf56c61509cd6068bc6dd58ab42c0ade5d5f97ec";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ docutils readme_renderer pygments ];
|
||||
checkInputs = [ mock ];
|
||||
|
||||
postPatch = ''
|
||||
# dict order breaking tests
|
||||
sed -i 's@<a href="http://www.example.com" rel="nofollow">@...@' src/restview/tests.py
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "ReStructuredText viewer";
|
||||
homepage = http://mg.pov.lt/restview/;
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = with lib.maintainers; [ koral ];
|
||||
};
|
||||
}
|
||||
@ -8,13 +8,13 @@
|
||||
# Should use buildPythonPackage here somehow
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "setuptools";
|
||||
version = "36.2.7";
|
||||
version = "36.4.0";
|
||||
name = "${python.libPrefix}-${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "b0fe5d432d922df595e918577c51458d63f245115d141b309ac32ecfca329df5";
|
||||
sha256 = "2758b0270fe8ceec42f336ee5b411e60dc8579febc27bb3ba9b794dc7f0239ae";
|
||||
};
|
||||
|
||||
buildInputs = [ python wrapPython unzip ];
|
||||
|
||||
@ -21,9 +21,12 @@ buildPythonPackage rec {
|
||||
sha256 = "26431ab706fbae896db7870a0892743bfbb9f5c83231644692166a31d2d86048";
|
||||
};
|
||||
|
||||
buildInputs = with self; [ nose ];
|
||||
checkInputs = with self; [ nose ];
|
||||
propagatedBuildInputs = with self; [numpy scipy pandas patsy cython matplotlib];
|
||||
|
||||
# Huge test suites with several test failures
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Statistical computations and models for use with SciPy";
|
||||
homepage = https://www.github.com/statsmodels/statsmodels;
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, jdk, zip, unzip, bash, makeWrapper, which }:
|
||||
{ stdenv, lib, fetchurl, jdk, zip, unzip, bash, writeScriptBin, coreutils, makeWrapper, which, python }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
version = "0.4.5";
|
||||
version = "0.5.4";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/bazelbuild/bazel/;
|
||||
homepage = "https://github.com/bazelbuild/bazel/";
|
||||
description = "Build tool that builds code quickly and reliably";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.philandstuff ];
|
||||
@ -16,40 +16,38 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
|
||||
sha256 = "0asmq3kxnl4326zhgh13mvcrc8jvmiswjj4ymrq0943q4vj7nwrb";
|
||||
sha256 = "1jdb8zbgafhz2qi0ajk34845kpmfhxchdimvwkq6lkb1159v0mr1";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
# Bazel expects several utils to be available in Bash even without PATH. Hence this hack.
|
||||
|
||||
customBash = writeScriptBin "bash" ''
|
||||
#!${stdenv.shell}
|
||||
PATH="$PATH:${lib.makeBinPath [ coreutils ]}" exec ${bash}/bin/bash "$@"
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
for f in $(grep -l -r '#!/bin/bash'); do
|
||||
substituteInPlace "$f" --replace '#!/bin/bash' '#!${bash}/bin/bash'
|
||||
done
|
||||
for f in \
|
||||
src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java \
|
||||
src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java \
|
||||
src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShRuleClasses.java \
|
||||
src/main/java/com/google/devtools/build/lib/rules/cpp/LinkCommandLine.java \
|
||||
; do
|
||||
substituteInPlace "$f" --replace /bin/bash ${bash}/bin/bash
|
||||
find src/main/java/com/google/devtools -type f -print0 | while IFS="" read -r -d "" path; do
|
||||
substituteInPlace "$path" \
|
||||
--replace /bin/bash ${customBash}/bin/bash \
|
||||
--replace /usr/bin/env ${coreutils}/bin/env
|
||||
done
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
stdenv.cc
|
||||
stdenv.cc.cc.lib
|
||||
jdk
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
zip
|
||||
python
|
||||
unzip
|
||||
makeWrapper
|
||||
which
|
||||
];
|
||||
|
||||
# These must be propagated since the dependency is hidden in a compressed
|
||||
# archive.
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bash
|
||||
customBash
|
||||
];
|
||||
|
||||
# If TMPDIR is in the unpack dir we run afoul of blaze's infinite symlink
|
||||
@ -80,7 +78,7 @@ stdenv.mkDerivation rec {
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
mv output/bazel $out/bin
|
||||
wrapProgram "$out/bin/bazel" --prefix PATH : "${stdenv.cc}/bin:${jdk}/bin"
|
||||
wrapProgram "$out/bin/bazel" --prefix PATH : "${lib.makeBinPath [ stdenv.cc jdk ]}"
|
||||
mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions
|
||||
mv output/bazel-complete.bash $out/share/bash-completion/completions/
|
||||
cp scripts/zsh_completion/_bazel $out/share/zsh/site-functions/
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
rake (11.1.1)
|
||||
rake (12.0.0)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
@ -10,4 +10,4 @@ DEPENDENCIES
|
||||
rake
|
||||
|
||||
BUNDLED WITH
|
||||
1.10.5
|
||||
1.14.6
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, bundlerEnv, ruby }:
|
||||
|
||||
bundlerEnv {
|
||||
name = "rake-11.1.1";
|
||||
name = "rake-${(import ./gemset.nix).rake.version}";
|
||||
|
||||
inherit ruby;
|
||||
gemdir = ./.;
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
{
|
||||
"rake" = {
|
||||
version = "11.1.1";
|
||||
rake = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n";
|
||||
type = "gem";
|
||||
sha256 = "0h8wcic2xh3lv7yvs05pqnfqb80jyl488f7136lgxmajb0s1rqhg";
|
||||
};
|
||||
version = "12.0.0";
|
||||
};
|
||||
}
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
let
|
||||
basename = "gdb-${version}";
|
||||
version = "8.0";
|
||||
version = "8.0.1";
|
||||
in
|
||||
|
||||
assert targetPlatform.isHurd -> mig != null && hurd != null;
|
||||
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gdb/${basename}.tar.xz";
|
||||
sha256 = "1vplyf8v70yn0rdqjx6awl9nmfbwaj5ynwwjxwa71rhp97z4z8pn";
|
||||
sha256 = "1qwmcbaxf0jc7yjl0fimgcfj2yqcrl6h7azgs1d838kbwf9mzg9x";
|
||||
};
|
||||
|
||||
patches = [ ./debug-info-from-env.patch ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "yarn-${version}";
|
||||
version = "0.28.4";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
|
||||
sha256 = "12l1ljgzk45i24d9x7036hdrb8f46in93xfc2z4wq94wzm24s2za";
|
||||
sha256 = "1adp5wzxbq5glxbmqfvmjn3vld93mvl65y4bmhjn8clzj7n25piq";
|
||||
};
|
||||
|
||||
buildInputs = [makeWrapper nodejs];
|
||||
|
||||
@ -26,7 +26,7 @@ let
|
||||
demo = bdist { };
|
||||
};
|
||||
};
|
||||
actual = binDists.${stdenv.system}.${releaseType};
|
||||
actual = binDists.${stdenv.system}.${releaseType} or (throw "Factorio: unsupported platform");
|
||||
|
||||
bdistForArch = arch: { sha256 ? null
|
||||
, version ? "0.15.34"
|
||||
@ -34,7 +34,7 @@ let
|
||||
, nameMut ? x: x
|
||||
}:
|
||||
if sha256 == null then
|
||||
abort "Factorio ${releaseType}-${arch.inTar} binaries are not (and were never?) available to download"
|
||||
throw "Factorio ${releaseType}-${arch.inTar} binaries are not (and were never?) available to download"
|
||||
else {
|
||||
inherit version arch;
|
||||
src = fetcher {
|
||||
|
||||
@ -16,7 +16,13 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
patches = [ ./file-existence.patch ];
|
||||
patches = [
|
||||
./file-existence.patch
|
||||
(fetchurl {
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/games-strategy/scorched3d/files/scorched3d-44-fix-c++14.patch?id=1bbcfc9ae3dfdfcbdd35151cb7b6050776215e4d";
|
||||
sha256 = "1farmjxbc2wm4scsdbdnvh29fipnb6mp6z85hxz4bx6n9kbc8y7n";
|
||||
})
|
||||
];
|
||||
|
||||
sourceRoot = "scorched";
|
||||
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
{ stdenv
|
||||
, cairo
|
||||
, cmake
|
||||
, fetchsvn
|
||||
, fetchFromGitHub
|
||||
, ffmpeg
|
||||
, gettext
|
||||
, gtk2-x11
|
||||
, libpng
|
||||
, libpthreadstubs
|
||||
, libXdmcp
|
||||
@ -11,18 +12,21 @@
|
||||
, mesa
|
||||
, openal
|
||||
, pkgconfig
|
||||
, SDL
|
||||
, SDL2
|
||||
, sfml
|
||||
, wxGTK
|
||||
, zip
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "VBAM-1507";
|
||||
src = fetchsvn {
|
||||
url = "svn://svn.code.sf.net/p/vbam/code/trunk";
|
||||
rev = 1507;
|
||||
sha256 = "0fqvgi5s0sacqr9yi7kv1klqlvfzr13sjq5ikipirz0jv50kjxa7";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "visualboyadvance-m-${version}";
|
||||
version = "unstable-2017-09-04";
|
||||
src = fetchFromGitHub {
|
||||
owner = "visualboyadvance-m";
|
||||
repo = "visualboyadvance-m";
|
||||
rev = "ceef480";
|
||||
sha256 = "1lpmlj8mv6fwlfg9m58hzggx8ld6cnjvaqx5ka5sffxd9v95qq2l";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@ -30,14 +34,12 @@ stdenv.mkDerivation {
|
||||
cmake
|
||||
ffmpeg
|
||||
gettext
|
||||
libpng
|
||||
libpthreadstubs
|
||||
libXdmcp
|
||||
libxshmfence
|
||||
gtk2-x11
|
||||
mesa
|
||||
openal
|
||||
pkgconfig
|
||||
SDL
|
||||
SDL2
|
||||
sfml
|
||||
wxGTK
|
||||
zip
|
||||
zlib
|
||||
|
||||
@ -1,19 +1,21 @@
|
||||
{ stdenv, fetchFromGitHub }:
|
||||
{ stdenv, fetchFromGitHub, bash, perl, python }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dmtcp-${version}";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dmtcp";
|
||||
repo = "dmtcp";
|
||||
rev = version;
|
||||
sha256 = "08l774i8yp41j6kmzhj7x13475m5kdfhn678ydpm5cbg4l3dda3c";
|
||||
sha256 = "1z6cc7avs2sj8csf7rapf7nbw0giva6xpj0cshv7p9s643y8yxmi";
|
||||
};
|
||||
|
||||
dontDisableStatic = true;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
|
||||
substituteInPlace configure \
|
||||
--replace '#define ELF_INTERPRETER "$interp"' \
|
||||
"#define ELF_INTERPRETER \"$(cat $NIX_CC/nix-support/dynamic-linker)\""
|
||||
@ -25,16 +27,13 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace util/gdb-add-symbol-file \
|
||||
--replace /bin/bash ${stdenv.shell}
|
||||
substituteInPlace test/autotest.py \
|
||||
--replace /usr/bin/env $(type -p env) \
|
||||
--replace /bin/bash $(type -p bash) \
|
||||
--replace /usr/bin/perl $(type -p perl) \
|
||||
--replace /usr/bin/python $(type -p python) \
|
||||
--replace /bin/bash ${bash}/bin/bash \
|
||||
--replace /usr/bin/perl ${perl}/bin/perl \
|
||||
--replace /usr/bin/python ${python}/bin/python \
|
||||
--replace "os.environ['USER']" "\"nixbld1\"" \
|
||||
--replace "os.getenv('USER')" "\"nixbld1\""
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Distributed MultiThreaded Checkpointing";
|
||||
longDescription = ''
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
import ./generic.nix (args // rec {
|
||||
version = "4.12.10";
|
||||
version = "4.12.11";
|
||||
extraMeta.branch = "4.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "1156ly1lmsr3l8ad8z80agsl026yk86nyypw67ksc66mznvzgyy0";
|
||||
sha256 = "015kyh0v9lkk4a6sa7ysddi7dm639z5p45v2sh2kswsih4sf7kxf";
|
||||
};
|
||||
|
||||
kernelPatches = args.kernelPatches;
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
import ./generic.nix (args // rec {
|
||||
version = "4.9.47";
|
||||
version = "4.9.48";
|
||||
extraMeta.branch = "4.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "1ja14l9gy7cpj94zwacr3gi4vqzfv2k78556fxga8q4lsrwrdgkm";
|
||||
sha256 = "0y3s5xbh5axdvsx9iwz7sinbm7v6j2dvmj8dz46zj1mziwicagwq";
|
||||
};
|
||||
|
||||
kernelPatches = args.kernelPatches;
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "atlassian-crowd-${version}";
|
||||
version = "2.12.0";
|
||||
version = "3.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.atlassian.com/software/crowd/downloads/binary/${name}.tar.gz";
|
||||
sha256 = "1kfnsa25axlyhnapfza381p94pyfixh7j999qhpg3ii821n9sggm";
|
||||
sha256 = "17pz0rgzdv40sbvzb9w6xmdg598m6gs7gsznfnxcy1j011cgg1wr";
|
||||
};
|
||||
|
||||
phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];
|
||||
|
||||
@ -1,22 +1,31 @@
|
||||
{ stdenv, fetchurl, which, bison, flex, libmaa, zlib, libtool }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.12.1";
|
||||
name = "dictd-${version}";
|
||||
version = "1.12.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/dict/dictd-${version}.tar.gz";
|
||||
sha256 = "0min6v60b6z5mrymyjfwzx8nv6rdm8pd8phlwl6v2jl5vkngcdx2";
|
||||
};
|
||||
|
||||
buildInputs = [ flex bison which libmaa zlib libtool ];
|
||||
buildInputs = [ libmaa zlib ];
|
||||
|
||||
nativeBuildInputs = [ bison flex libtool which ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
patchPhase = "patch -p0 < ${./buildfix.diff}";
|
||||
configureFlags = "--datadir=/var/run/current-system/share/dictd";
|
||||
configureFlags = [
|
||||
"--enable-dictorg"
|
||||
"--datadir=/run/current-system/share/dictd"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Dict protocol server and client";
|
||||
maintainers = [ maintainers.mornfall ];
|
||||
platforms = platforms.linux;
|
||||
homepage = http://www.dict.org;
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ mornfall ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
{ stdenv, fetchurl, unzip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mfi-controller-${version}";
|
||||
version = "2.1.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.ubnt.com/mfi/${version}/mFi.unix.zip";
|
||||
sha256 = "0b9q6025zf9zjzq8dcmcyai8rslx67g52j41gacxsk9i5dspmw90";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -ar conf data dl lib webapps $out
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.ubnt.com/;
|
||||
description = "Controller for Ubiquiti mFi devices";
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ elitak ];
|
||||
};
|
||||
}
|
||||
@ -1,45 +0,0 @@
|
||||
# This derivation was resurrected from 4c8ec5e12e187347fd97b1a1a9a43eb19e009ed0
|
||||
# by elitak for use with the Ubiquiti mFi Controller package, which breaks at
|
||||
# runtime on mongodb3+ and jre8+. We will need to pull in sufficiently old
|
||||
# versions of boost and v8 to build this, as well.
|
||||
{ stdenv, fetchurl, scons, boost155, v8_3_14, gperftools, pcre-cpp, snappy }:
|
||||
with stdenv.lib;
|
||||
let
|
||||
version = "2.4.8";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mongodb-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz";
|
||||
sha256 = "1p6gnharypglfp39halp72fig96fqjhakyy7m76a1prxwpjkqw7x";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ scons boost155 v8_3_14 gperftools pcre-cpp snappy ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace SConstruct \
|
||||
--replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR" \
|
||||
--replace 'CCFLAGS=["-Werror", "-pipe"]' 'CCFLAGS=["-pipe"]'
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-unused-local-typedefs";
|
||||
|
||||
buildPhase = ''
|
||||
export SCONSFLAGS="-j$NIX_BUILD_CORES"
|
||||
scons all --use-system-all
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib
|
||||
scons install --use-system-all --full --prefix=$out
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A scalable, high-performance, open source NoSQL database";
|
||||
homepage = http://www.mongodb.org;
|
||||
license = licenses.agpl3;
|
||||
maintainers = with maintainers; [ bluescreen303 elitak ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -17,7 +17,10 @@ pythonPackages.buildPythonApplication rec {
|
||||
--replace 'certifi==2017.1.23' 'certifi' \
|
||||
--replace 'lxml==3.7.3' 'lxml' \
|
||||
--replace 'pyopenssl==16.2.0' 'pyopenssl' \
|
||||
--replace 'pygments==2.1.3' 'pygments>=2.1,<3.0'
|
||||
--replace 'pygments==2.1.3' 'pygments>=2.1,<3.0' \
|
||||
--replace 'flask==0.12' 'flask==0.12.*' \
|
||||
--replace 'requests[socks]==2.13.0' 'requests[socks]==2.*' \
|
||||
--replace 'python-dateutil==2.6.0' 'python-dateutil==2.6.*'
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
, cmake, gettext, libtool
|
||||
, glproto, mesa_glu
|
||||
, gnutls, pam, nettle
|
||||
, xterm }:
|
||||
, xterm, openssh }:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
inherit fontDirectories;
|
||||
|
||||
patchPhase = ''
|
||||
postPatch = ''
|
||||
sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver
|
||||
fontPath=
|
||||
for i in $fontDirectories; do
|
||||
@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
|
||||
done
|
||||
done
|
||||
sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -fp '"$fontPath"'";' unix/vncserver
|
||||
substituteInPlace vncviewer/vncviewer.cxx \
|
||||
--replace '"/usr/bin/ssh' '"${openssh}/bin/ssh'
|
||||
'';
|
||||
|
||||
dontUseCmakeBuildDir = true;
|
||||
|
||||
24
pkgs/tools/misc/gosu/default.nix
Normal file
24
pkgs/tools/misc/gosu/default.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "gosu-${version}";
|
||||
version = "2017-05-09";
|
||||
rev = "e87cf95808a7b16208515c49012aa3410bc5bba8";
|
||||
|
||||
goPackagePath = "github.com/tianon/gosu";
|
||||
|
||||
src = fetchgit {
|
||||
inherit rev;
|
||||
url = "https://github.com/tianon/gosu";
|
||||
sha256 = "1qp1cfx0hrr4qlnh7rhjb4xlxv9697flmgzzl6jcdkrpk1f0bz8m";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
meta = {
|
||||
description= "Tool that avoids TTY and signal-forwarding behavior of sudo and su";
|
||||
homepage = "https://github.com/tianon/gosu";
|
||||
licence = stdenv.lib.licenses.gpl3;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
11
pkgs/tools/misc/gosu/deps.nix
Normal file
11
pkgs/tools/misc/gosu/deps.nix
Normal file
@ -0,0 +1,11 @@
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/opencontainers/runc";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/opencontainers/runc";
|
||||
rev = "5274430fee9bc930598cfd9c9dbd33213f79f96e";
|
||||
sha256 = "149057gm2y1mc45s7bh43c1ngjg1m54jkpaxw534ir9v5mb1zsxx";
|
||||
};
|
||||
}
|
||||
]
|
||||
@ -2,7 +2,7 @@
|
||||
asciidoc, libxml2, libxslt, docbook_xml_xslt }:
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
version = "7.1.1";
|
||||
version = "7.1.2";
|
||||
name = "offlineimap-${version}";
|
||||
namePrefix = "";
|
||||
|
||||
@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec {
|
||||
owner = "OfflineIMAP";
|
||||
repo = "offlineimap";
|
||||
rev = "v${version}";
|
||||
sha256 = "12fv6fzi3cb0hkvs4h5vj2i440d85wzjjyjl90zvyxvlfy0pmljl";
|
||||
sha256 = "1bvlbw3bsx3qs8np1qdqbhpdr9qykzsql9684gm7gg84gw51i667";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1079,6 +1079,8 @@ with pkgs;
|
||||
|
||||
gorilla-bin = callPackage ../tools/security/gorilla-bin { };
|
||||
|
||||
gosu = callPackage ../tools/misc/gosu { };
|
||||
|
||||
gringo = callPackage ../tools/misc/gringo { };
|
||||
|
||||
gti = callPackage ../tools/misc/gti { };
|
||||
@ -10629,10 +10631,6 @@ with pkgs;
|
||||
gnutls = gnutls;
|
||||
});
|
||||
|
||||
v8_3_14 = callPackage ../development/libraries/v8/3.14.nix {
|
||||
inherit (python2Packages) python gyp;
|
||||
};
|
||||
|
||||
v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix {
|
||||
inherit (python2Packages) python gyp;
|
||||
cctools = darwin.cctools;
|
||||
@ -10734,6 +10732,11 @@ with pkgs;
|
||||
gst-plugins-base = gst_all_1.gst-plugins-base;
|
||||
};
|
||||
|
||||
webkitgtk217x = callPackage ../development/libraries/webkitgtk/2.17.nix {
|
||||
harfbuzz = harfbuzz-icu;
|
||||
gst-plugins-base = gst_all_1.gst-plugins-base;
|
||||
};
|
||||
|
||||
webkitgtk24x-gtk2 = webkitgtk24x-gtk3.override {
|
||||
withGtk2 = true;
|
||||
enableIntrospection = false;
|
||||
@ -11335,8 +11338,6 @@ with pkgs;
|
||||
|
||||
meteor = callPackage ../servers/meteor/default.nix { };
|
||||
|
||||
mfi = callPackage ../servers/mfi { };
|
||||
|
||||
minio = callPackage ../servers/minio { };
|
||||
|
||||
# Backwards compatibility.
|
||||
@ -11478,8 +11479,6 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
mongodb248 = callPackage ../servers/nosql/mongodb/2.4.8.nix { };
|
||||
|
||||
percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { };
|
||||
percona-server = percona-server56;
|
||||
|
||||
@ -13406,6 +13405,7 @@ with pkgs;
|
||||
|
||||
amarok = kde4.callPackage ../applications/audio/amarok {
|
||||
ffmpeg = ffmpeg_2;
|
||||
stdenv = overrideCC stdenv gcc5;
|
||||
};
|
||||
|
||||
AMB-plugins = callPackage ../applications/audio/AMB-plugins { };
|
||||
@ -16999,9 +16999,10 @@ with pkgs;
|
||||
|
||||
xiphos = callPackage ../applications/misc/xiphos {
|
||||
gconf = gnome2.GConf;
|
||||
inherit (gnome2) gtkhtml libgtkhtml libglade scrollkeeper;
|
||||
inherit (gnome2) libglade scrollkeeper;
|
||||
gtkhtml = gnome2.gtkhtml4;
|
||||
webkitgtk = webkitgtk217x;
|
||||
python = python27;
|
||||
webkitgtk = webkitgtk24x-gtk2;
|
||||
};
|
||||
|
||||
xournal = callPackage ../applications/graphics/xournal {
|
||||
@ -18414,8 +18415,10 @@ with pkgs;
|
||||
|
||||
### SCIENCE / MATH
|
||||
|
||||
caffe = callPackage ../applications/science/math/caffe {
|
||||
cudaSupport = config.caffe.cudaSupport or config.cudaSupport or true;
|
||||
caffe = callPackage ../applications/science/math/caffe rec {
|
||||
cudaSupport = config.caffe.cudaSupport or config.cudaSupport or false;
|
||||
# CUDA 8 doesn't support GCC 6.
|
||||
stdenv = if cudaSupport then overrideCC pkgs.stdenv gcc5 else pkgs.stdenv;
|
||||
};
|
||||
|
||||
ecm = callPackage ../applications/science/math/ecm { };
|
||||
|
||||
@ -54,7 +54,7 @@ let
|
||||
|
||||
base64 = callPackage ../development/ocaml-modules/base64 { };
|
||||
|
||||
bap = callPackage ../development/ocaml-modules/bap { };
|
||||
bap = callPackage ../development/ocaml-modules/bap { cmdliner = cmdliner_0_9; };
|
||||
|
||||
bitstring = callPackage ../development/ocaml-modules/bitstring { };
|
||||
|
||||
@ -124,9 +124,9 @@ let
|
||||
|
||||
cil = callPackage ../development/ocaml-modules/cil { };
|
||||
|
||||
cmdliner = callPackage ../development/ocaml-modules/cmdliner { };
|
||||
cmdliner_0_9 = callPackage ../development/ocaml-modules/cmdliner/0.9.nix { };
|
||||
|
||||
cmdliner_1_0 = callPackage ../development/ocaml-modules/cmdliner/1.0.nix { };
|
||||
cmdliner = callPackage ../development/ocaml-modules/cmdliner { };
|
||||
|
||||
cohttp_p4 = callPackage ../development/ocaml-modules/cohttp/0.19.3.nix {
|
||||
lwt = lwt2;
|
||||
@ -447,8 +447,8 @@ let
|
||||
|
||||
ocpBuild = callPackage ../development/tools/ocaml/ocp-build { };
|
||||
|
||||
ocpIndent = callPackage ../development/tools/ocaml/ocp-indent { cmdliner = cmdliner_1_0; };
|
||||
ocpIndent_1_5_2 = callPackage ../development/tools/ocaml/ocp-indent/1.5.2.nix { };
|
||||
ocpIndent = callPackage ../development/tools/ocaml/ocp-indent { };
|
||||
ocpIndent_1_5_2 = callPackage ../development/tools/ocaml/ocp-indent/1.5.2.nix { cmdliner = cmdliner_0_9; };
|
||||
|
||||
ocp-index = callPackage ../development/tools/ocaml/ocp-index { ocpIndent = ocpIndent_1_5_2; };
|
||||
|
||||
|
||||
@ -746,6 +746,7 @@ let self = _self // overrides; _self = with self; {
|
||||
# Fix out of memory error on Perl 5.19.4 and later.
|
||||
../development/perl-modules/boost-geometry-utils-fix-oom.patch
|
||||
];
|
||||
perlPreHook = "export LD=$CC";
|
||||
};
|
||||
|
||||
BusinessHours = buildPerlPackage rec {
|
||||
|
||||
@ -1565,6 +1565,13 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
caffe = pkgs.caffe.override {
|
||||
python = self.python;
|
||||
boost = self.boost;
|
||||
numpy = self.numpy;
|
||||
pythonSupport = true;
|
||||
};
|
||||
|
||||
capstone = buildPythonPackage rec {
|
||||
name = "capstone-3.0.4";
|
||||
src = pkgs.fetchurl {
|
||||
@ -1746,6 +1753,12 @@ in {
|
||||
|
||||
cycler = callPackage ../development/python-modules/cycler { };
|
||||
|
||||
dlib = buildPythonPackage rec {
|
||||
inherit (pkgs.dlib) name src nativeBuildInputs meta;
|
||||
|
||||
buildInputs = pkgs.dlib.buildInputs ++ [ self.boost ];
|
||||
};
|
||||
|
||||
datadog = buildPythonPackage rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "datadog";
|
||||
@ -7005,27 +7018,7 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
logfury = buildPythonPackage rec {
|
||||
name = "logfury-${version}";
|
||||
version = "0.1.2";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/l/logfury/${name}.tar.gz";
|
||||
sha256 = "1lywirv3d1lw691mc4mfpz7ak6r49klri43bbfgdnvsfppxminj2";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ self.funcsigs
|
||||
self.six
|
||||
];
|
||||
|
||||
meta = with pkgs.stdenv.lib; {
|
||||
description = "Logfury is for python library maintainers. It allows for responsible, low-boilerplate logging of method calls.";
|
||||
homepage = "https://github.com/ppolewicz/logfury";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ jwiegley ];
|
||||
};
|
||||
};
|
||||
logfury = callPackage ../development/python-modules/logfury { };
|
||||
|
||||
ndg-httpsclient = buildPythonPackage rec {
|
||||
version = "0.4.2";
|
||||
@ -11190,29 +11183,7 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
keyring = buildPythonPackage rec {
|
||||
name = "keyring-8.4.1";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/k/keyring/${name}.tar.gz";
|
||||
sha256 = "1286sh5g53168qxbl4g5bmns9ci0ld0jl3h44b7h8is5nw1421ar";
|
||||
};
|
||||
|
||||
buildInputs = with self;
|
||||
[ fs gdata python_keyczar mock pyasn1 pycrypto pytest_28 six setuptools_scm pytestrunner ];
|
||||
|
||||
checkPhase = ''
|
||||
py.test $out
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Store and access your passwords safely";
|
||||
homepage = "https://pypi.python.org/pypi/keyring";
|
||||
license = licenses.psfl;
|
||||
maintainers = with maintainers; [ lovek323 ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
};
|
||||
keyring = callPackage ../development/python-modules/keyring { };
|
||||
|
||||
klaus = buildPythonPackage rec {
|
||||
version = "0.9.1";
|
||||
@ -15777,22 +15748,7 @@ in {
|
||||
|
||||
pbr = callPackage ../development/python-modules/pbr { };
|
||||
|
||||
fixtures = buildPythonPackage rec {
|
||||
name = "fixtures-1.4.0";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/f/fixtures/${name}.tar.gz";
|
||||
sha256 = "0djxvdwm8s60dbfn7bhf40x6g818p3b3mlwijm1c3bqg7msn271y";
|
||||
};
|
||||
|
||||
buildInputs = with self; [ pbr testtools mock ];
|
||||
|
||||
meta = {
|
||||
description = "Reusable state for writing clean tests and more";
|
||||
homepage = "https://pypi.python.org/pypi/fixtures";
|
||||
license = licenses.asl20;
|
||||
};
|
||||
};
|
||||
fixtures = callPackage ../development/python-modules/fixtures { };
|
||||
|
||||
pelican = callPackage ../development/python-modules/pelican {
|
||||
inherit (pkgs) glibcLocales pandoc git;
|
||||
@ -19156,31 +19112,7 @@ in {
|
||||
};
|
||||
|
||||
|
||||
restview = buildPythonPackage rec {
|
||||
name = "restview-${version}";
|
||||
version = "2.5.2";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/r/restview/${name}.tar.gz";
|
||||
sha256 = "0gmdmnlhiy6lagi17maiz312374hk6g6x90fhjwnbrwxif4r9bd5";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with self; [ docutils readme pygments ];
|
||||
buildInputs = with self; [ mock ];
|
||||
|
||||
patchPhase = ''
|
||||
# dict order breaking tests
|
||||
sed -i 's@<a href="http://www.example.com" rel="nofollow">@...@' src/restview/tests.py
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "ReStructuredText viewer";
|
||||
homepage = http://mg.pov.lt/restview/;
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ koral ];
|
||||
};
|
||||
};
|
||||
restview = callPackage ../development/python-modules/restview { };
|
||||
|
||||
readme = buildPythonPackage rec {
|
||||
name = "readme-${version}";
|
||||
@ -19209,6 +19141,8 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
readme_renderer = callPackage ../development/python-modules/readme_renderer { };
|
||||
|
||||
rjsmin = callPackage ../development/python-modules/rjsmin { };
|
||||
|
||||
pysolr = buildPythonPackage rec {
|
||||
@ -19295,27 +19229,7 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
django-multiselectfield = buildPythonPackage rec {
|
||||
name = "django-multiselectfield-${version}";
|
||||
version = "0.1.3";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/d/django-multiselectfield/django-multiselectfield-${version}.tar.gz";
|
||||
sha256 = "0v7wf82f8688srdsym9ajv1j54bxfxwvydypc03f8xyl4c1raziv";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with self; [
|
||||
|
||||
];
|
||||
buildInputs = with self; [
|
||||
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "django-multiselectfield";
|
||||
homepage = "https://github.com/goinnn/django-multiselectfield";
|
||||
};
|
||||
};
|
||||
django-multiselectfield = callPackage ../development/python-modules/django-multiselectfield { };
|
||||
|
||||
reviewboard = buildPythonPackage rec {
|
||||
name = "ReviewBoard-2.5.1.1";
|
||||
@ -27484,7 +27398,7 @@ EOF
|
||||
|
||||
preshed = callPackage ../development/python-modules/preshed { };
|
||||
|
||||
backports_weakref = callPackage ../development/python-modules/backports_weakref { };
|
||||
backports_weakref = callPackage ../development/python-modules/backports_weakref { };
|
||||
|
||||
thinc = callPackage ../development/python-modules/thinc { };
|
||||
|
||||
@ -27493,7 +27407,7 @@ EOF
|
||||
behave = callPackage ../development/python-modules/behave { };
|
||||
|
||||
pyhamcrest = callPackage ../development/python-modules/pyhamcrest { };
|
||||
|
||||
|
||||
parse = callPackage ../development/python-modules/parse { };
|
||||
|
||||
parse-type = callPackage ../development/python-modules/parse-type { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user